diff --git a/.github/workflows/pipe-it.yml b/.github/workflows/pipe-it.yml index 2036976a6377..2a41cdfdf5b7 100644 --- a/.github/workflows/pipe-it.yml +++ b/.github/workflows/pipe-it.yml @@ -431,7 +431,7 @@ jobs: name: cluster-log-dual-tree-manual-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} path: integration-test/target/cluster-logs retention-days: 30 - subscription-arch-verification: + subscription-tree-arch-verification: strategy: fail-fast: false max-parallel: 15 @@ -476,7 +476,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ -pl integration-test \ - -am -PMultiClusterIT2SubscriptionArchVerification \ + -am -PMultiClusterIT2SubscriptionTreeArchVerification \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) @@ -515,7 +515,7 @@ jobs: name: cluster-log-subscription-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} path: integration-test/target/cluster-logs retention-days: 30 - subscription-regression-consumer: + subscription-tree-regression-consumer: strategy: fail-fast: false max-parallel: 15 @@ -560,7 +560,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ -pl integration-test \ - -am -PMultiClusterIT2SubscriptionRegressionConsumer \ + -am -PMultiClusterIT2SubscriptionTreeRegressionConsumer \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) @@ -599,7 +599,7 @@ jobs: name: cluster-log-subscription-regression-consumer-java${{ matrix.java }}-${{ runner.os }}-${{ matrix.cluster1 }}-${{ matrix.cluster2 }} path: integration-test/target/cluster-logs retention-days: 30 - subscription-regression-misc: + subscription-tree-regression-misc: strategy: fail-fast: false max-parallel: 15 @@ -644,7 +644,7 @@ jobs: -DintegrationTest.forkCount=1 -DConfigNodeMaxHeapSize=256 -DDataNodeMaxHeapSize=1024 -DDataNodeMaxDirectMemorySize=768 \ -DClusterConfigurations=${{ matrix.cluster1 }},${{ matrix.cluster2 }} \ -pl integration-test \ - -am -PMultiClusterIT2SubscriptionRegressionMisc \ + -am -PMultiClusterIT2SubscriptionTreeRegressionMisc \ -ntp >> ~/run-tests-$attempt.log && return 0 test_output=$(cat ~/run-tests-$attempt.log) diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 34a9b92b5d67..f8a1bd76a332 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -449,7 +449,7 @@ org.apache.iotdb.itbase.category.ManualIT - 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 + 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 false true true @@ -541,13 +541,13 @@ - MultiClusterIT2SubscriptionArchVerification + MultiClusterIT2SubscriptionTreeArchVerification false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification false true true @@ -555,13 +555,13 @@ - MultiClusterIT2SubscriptionRegressionConsumer + MultiClusterIT2SubscriptionTreeRegressionConsumer false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer false true true @@ -569,13 +569,55 @@ - MultiClusterIT2SubscriptionRegressionMisc + MultiClusterIT2SubscriptionTreeRegressionMisc false org.apache.iotdb.itbase.category.ManualIT - org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc + false + true + true + MultiCluster + + + + MultiClusterIT2SubscriptionTableArchVerification + + false + + + org.apache.iotdb.itbase.category.ManualIT + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableArchVerification + false + true + true + MultiCluster + + + + MultiClusterIT2SubscriptionTableRegressionConsumer + + false + + + org.apache.iotdb.itbase.category.ManualIT + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionConsumer + false + true + true + MultiCluster + + + + MultiClusterIT2SubscriptionTableRegressionMisc + + false + + + org.apache.iotdb.itbase.category.ManualIT + org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTableRegressionMisc false true true diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableArchVerification.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableArchVerification.java new file mode 100644 index 000000000000..dff8f4b0e365 --- /dev/null +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableArchVerification.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.itbase.category; + +public interface MultiClusterIT2SubscriptionTableArchVerification {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionConsumer.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionConsumer.java new file mode 100644 index 000000000000..88cb4adbab22 --- /dev/null +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionConsumer.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.itbase.category; + +public interface MultiClusterIT2SubscriptionTableRegressionConsumer {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionArchVerification.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionMisc.java similarity index 92% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionArchVerification.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionMisc.java index 3f0c5afa50da..fafa9915aaed 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionArchVerification.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTableRegressionMisc.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public interface MultiClusterIT2SubscriptionArchVerification {} +public interface MultiClusterIT2SubscriptionTableRegressionMisc {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionMisc.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeArchVerification.java similarity index 92% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionMisc.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeArchVerification.java index 30f1ef217f2f..5c3531d5281f 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionMisc.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeArchVerification.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public interface MultiClusterIT2SubscriptionRegressionMisc {} +public interface MultiClusterIT2SubscriptionTreeArchVerification {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionConsumer.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionConsumer.java new file mode 100644 index 000000000000..71b1f1f0869d --- /dev/null +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionConsumer.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.itbase.category; + +public interface MultiClusterIT2SubscriptionTreeRegressionConsumer {} diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionConsumer.java b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionMisc.java similarity index 93% rename from integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionConsumer.java rename to integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionMisc.java index d2d63318ef7a..173f4c8044ab 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionRegressionConsumer.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/category/MultiClusterIT2SubscriptionTreeRegressionMisc.java @@ -19,4 +19,4 @@ package org.apache.iotdb.itbase.category; -public interface MultiClusterIT2SubscriptionRegressionConsumer {} +public interface MultiClusterIT2SubscriptionTreeRegressionMisc {} diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/tablemodel/.gitkeep b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/tablemodel/.gitkeep new file mode 100644 index 000000000000..585be9602fc3 --- /dev/null +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/tablemodel/.gitkeep @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionConsumerGroupIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionConsumerGroupIT.java index 0a6a9dd4454d..ece07a991616 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionConsumerGroupIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.subscription.it.dual; +package org.apache.iotdb.subscription.it.dual.treemodel; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; @@ -26,7 +26,7 @@ import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.SubscriptionTreeSession; @@ -35,6 +35,7 @@ import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; import org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant; +import org.apache.iotdb.subscription.it.dual.AbstractSubscriptionDualIT; import org.apache.tsfile.read.TsFileReader; import org.apache.tsfile.read.common.Path; @@ -69,7 +70,7 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionArchVerification.class}) +@Category({MultiClusterIT2SubscriptionTreeArchVerification.class}) public class IoTDBSubscriptionConsumerGroupIT extends AbstractSubscriptionDualIT { // Test dimensions: diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTimePrecisionIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTimePrecisionIT.java index 72ec29e93f2f..f24b832153f7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTimePrecisionIT.java @@ -17,17 +17,18 @@ * under the License. */ -package org.apache.iotdb.subscription.it.dual; +package org.apache.iotdb.subscription.it.dual.treemodel; import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.SubscriptionTreeSession; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessage; import org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant; +import org.apache.iotdb.subscription.it.dual.AbstractSubscriptionDualIT; import org.apache.tsfile.write.record.Tablet; import org.junit.Before; @@ -50,7 +51,7 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionArchVerification.class}) +@Category({MultiClusterIT2SubscriptionTreeArchVerification.class}) public class IoTDBSubscriptionTimePrecisionIT extends AbstractSubscriptionDualIT { private static final Logger LOGGER = diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTopicIT.java similarity index 99% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTopicIT.java index c3ef301fee20..373e83068bdd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTopicIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.subscription.it.dual; +package org.apache.iotdb.subscription.it.dual.treemodel; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.confignode.rpc.thrift.TShowSubscriptionReq; @@ -27,7 +27,7 @@ import org.apache.iotdb.db.it.utils.TestUtils; import org.apache.iotdb.isession.ISession; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.SubscriptionTreeSession; @@ -37,6 +37,7 @@ import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; import org.apache.iotdb.session.subscription.payload.SubscriptionTsFileHandler; import org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant; +import org.apache.iotdb.subscription.it.dual.AbstractSubscriptionDualIT; import org.apache.tsfile.read.TsFileReader; import org.apache.tsfile.read.common.Path; @@ -69,7 +70,7 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionArchVerification.class}) +@Category({MultiClusterIT2SubscriptionTreeArchVerification.class}) public class IoTDBSubscriptionTopicIT extends AbstractSubscriptionDualIT { private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSubscriptionTopicIT.class); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java index 8de7f5118b08..be478548c311 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionBasicIT.java @@ -57,9 +57,6 @@ import java.util.concurrent.locks.LockSupport; import java.util.stream.Collectors; -import static org.apache.iotdb.db.it.utils.TestUtils.assertTableNonQueryTestFail; -import static org.apache.iotdb.db.it.utils.TestUtils.assertTableTestFail; -import static org.apache.iotdb.db.it.utils.TestUtils.createUser; import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; import static org.junit.Assert.fail; @@ -624,38 +621,4 @@ public void testMissingConsumerId() { fail(e.getMessage()); } } - - @Test - public void testTablePermission() { - createUser(EnvFactory.getEnv(), "test", "test123"); - - assertTableNonQueryTestFail( - EnvFactory.getEnv(), - "create topic topic1", - "803: Access Denied: No permissions for this operation, only root user is allowed", - "test", - "test123", - null); - assertTableTestFail( - EnvFactory.getEnv(), - "show topics", - "803: Access Denied: No permissions for this operation, only root user is allowed", - "test", - "test123", - null); - assertTableTestFail( - EnvFactory.getEnv(), - "show subscriptions", - "803: Access Denied: No permissions for this operation, only root user is allowed", - "test", - "test123", - null); - assertTableNonQueryTestFail( - EnvFactory.getEnv(), - "drop topic topic1", - "803: Access Denied: No permissions for this operation, only root user is allowed", - "test", - "test123", - null); - } } diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionPermissionIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/tablemodel/IoTDBSubscriptionPermissionIT.java similarity index 73% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionPermissionIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/local/tablemodel/IoTDBSubscriptionPermissionIT.java index ce5a7df788a0..14bf3583ad13 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionPermissionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/local/tablemodel/IoTDBSubscriptionPermissionIT.java @@ -17,20 +17,22 @@ * under the License. */ -package org.apache.iotdb.subscription.it.local; +package org.apache.iotdb.subscription.it.local.tablemodel; import org.apache.iotdb.db.it.utils.TestUtils; -import org.apache.iotdb.isession.SessionConfig; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.LocalStandaloneIT; -import org.apache.iotdb.session.subscription.SubscriptionTreeSession; +import org.apache.iotdb.session.subscription.ISubscriptionTableSession; +import org.apache.iotdb.session.subscription.SubscriptionTableSessionBuilder; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; -import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; +import org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePushConsumer; +import org.apache.iotdb.session.subscription.consumer.table.SubscriptionTablePushConsumerBuilder; import org.apache.iotdb.session.subscription.model.Subscription; import org.apache.iotdb.session.subscription.model.Topic; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; +import org.apache.iotdb.subscription.it.local.AbstractSubscriptionLocalIT; import org.junit.Assert; import org.junit.Before; @@ -43,6 +45,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import static org.apache.iotdb.db.it.utils.TestUtils.assertTableNonQueryTestFail; +import static org.apache.iotdb.db.it.utils.TestUtils.assertTableTestFail; import static org.apache.iotdb.db.it.utils.TestUtils.createUser; import static org.junit.Assert.fail; @@ -68,8 +72,8 @@ public void testMetaAccessControl() { createUser(EnvFactory.getEnv(), username, password); // root user - try (final SubscriptionTreeSession session = new SubscriptionTreeSession(host, port)) { - session.open(); + try (final ISubscriptionTableSession session = + new SubscriptionTableSessionBuilder().host(host).port(port).build()) { // create topic final String topicName = "topic_root"; session.createTopic(topicName); @@ -90,39 +94,48 @@ public void testMetaAccessControl() { } // normal user - try (final SubscriptionTreeSession session = - new SubscriptionTreeSession( - host, port, username, password, SessionConfig.DEFAULT_MAX_FRAME_SIZE)) { - session.open(); + try (final ISubscriptionTableSession session = + new SubscriptionTableSessionBuilder() + .host(host) + .port(port) + .username(username) + .password(password) + .build()) { // create topic - String topicName = "topic_thulab"; + final String topicName = "topic_thulab"; session.createTopic(topicName); fail(); - } catch (final Exception e) { + } catch (final Exception ignored) { } // normal user - try (final SubscriptionTreeSession session = - new SubscriptionTreeSession( - host, port, username, password, SessionConfig.DEFAULT_MAX_FRAME_SIZE)) { - session.open(); + try (final ISubscriptionTableSession session = + new SubscriptionTableSessionBuilder() + .host(host) + .port(port) + .username(username) + .password(password) + .build()) { // show topics session.getTopics(); fail(); - } catch (final Exception e) { + } catch (final Exception ignored) { } // normal user - try (final SubscriptionTreeSession session = - new SubscriptionTreeSession( - host, port, username, password, SessionConfig.DEFAULT_MAX_FRAME_SIZE)) { - session.open(); + try (final ISubscriptionTableSession session = + new SubscriptionTableSessionBuilder() + .host(host) + .port(port) + .username(username) + .password(password) + .build()) { // show subscriptions session.getSubscriptions(); fail(); - } catch (final Exception e) { + } catch (final Exception ignored) { } } @@ -156,8 +169,8 @@ public void testRuntimeAccessControl() { } // root user - try (final SubscriptionTreeSession session = new SubscriptionTreeSession(host, port)) { - session.open(); + try (final ISubscriptionTableSession session = + new SubscriptionTableSessionBuilder().host(host).port(port).build()) { // create topic session.createTopic(topicName); Assert.assertTrue(session.getTopic(topicName).isPresent()); @@ -168,8 +181,8 @@ public void testRuntimeAccessControl() { } final AtomicInteger rowCount = new AtomicInteger(); - try (final SubscriptionTreePushConsumer consumer1 = - new SubscriptionTreePushConsumer.Builder() + try (final ISubscriptionTablePushConsumer consumer1 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("thulab") @@ -188,9 +201,9 @@ public void testRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer(); - final SubscriptionTreePushConsumer consumer2 = - new SubscriptionTreePushConsumer.Builder() + .build(); + final ISubscriptionTablePushConsumer consumer2 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("thulab") @@ -209,9 +222,9 @@ public void testRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer(); - final SubscriptionTreePushConsumer consumer3 = - new SubscriptionTreePushConsumer.Builder() + .build(); + final ISubscriptionTablePushConsumer consumer3 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("hacker") @@ -230,7 +243,7 @@ public void testRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer()) { + .build()) { consumer1.open(); consumer1.subscribe(topicName); @@ -240,7 +253,7 @@ public void testRuntimeAccessControl() { consumer3.subscribe(topicName); fail(); - } catch (final Exception e) { + } catch (final Exception ignored) { } } @@ -264,8 +277,8 @@ public void testStrictRuntimeAccessControl() { } final AtomicInteger rowCount = new AtomicInteger(); - try (final SubscriptionTreePushConsumer consumer1 = - new SubscriptionTreePushConsumer.Builder() + try (final ISubscriptionTablePushConsumer consumer1 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("thulab") @@ -284,9 +297,9 @@ public void testStrictRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer(); - final SubscriptionTreePushConsumer consumer2 = - new SubscriptionTreePushConsumer.Builder() + .build(); + final ISubscriptionTablePushConsumer consumer2 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("thulab") @@ -305,9 +318,9 @@ public void testStrictRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer(); - final SubscriptionTreePushConsumer consumer3 = - new SubscriptionTreePushConsumer.Builder() + .build(); + final ISubscriptionTablePushConsumer consumer3 = + new SubscriptionTablePushConsumerBuilder() .host(host) .port(port) .username("hacker") @@ -326,14 +339,48 @@ public void testStrictRuntimeAccessControl() { } return ConsumeResult.SUCCESS; }) - .buildPushConsumer()) { + .build()) { consumer1.open(); consumer2.open(); consumer3.open(); fail(); - } catch (final Exception e) { + } catch (final Exception ignored) { } } + + @Test + public void testTablePermission() { + createUser(EnvFactory.getEnv(), "test", "test123"); + + assertTableNonQueryTestFail( + EnvFactory.getEnv(), + "create topic topic1", + "803: Access Denied: No permissions for this operation, only root user is allowed", + "test", + "test123", + null); + assertTableTestFail( + EnvFactory.getEnv(), + "show topics", + "803: Access Denied: No permissions for this operation, only root user is allowed", + "test", + "test123", + null); + assertTableTestFail( + EnvFactory.getEnv(), + "show subscriptions", + "803: Access Denied: No permissions for this operation, only root user is allowed", + "test", + "test123", + null); + assertTableNonQueryTestFail( + EnvFactory.getEnv(), + "drop topic topic1", + "803: Access Denied: No permissions for this operation, only root user is allowed", + "test", + "test123", + null); + } } diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/tablemodel/.gitkeep b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/tablemodel/.gitkeep new file mode 100644 index 000000000000..585be9602fc3 --- /dev/null +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/tablemodel/.gitkeep @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/IoTDBSubscriptionSharingIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/IoTDBSubscriptionSharingIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/IoTDBSubscriptionSharingIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/IoTDBSubscriptionSharingIT.java index 6a1486b99507..f92f8b0b2c3b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/IoTDBSubscriptionSharingIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/IoTDBSubscriptionSharingIT.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple; +package org.apache.iotdb.subscription.it.triple.treemodel; import org.apache.iotdb.isession.ISession; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeArchVerification; import org.apache.iotdb.itbase.env.BaseEnv; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; @@ -32,6 +32,8 @@ import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; +import org.apache.iotdb.subscription.it.triple.AbstractSubscriptionTripleIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi.IoTDBMultiGroupVsMultiConsumerIT; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.TsFileReader; @@ -60,12 +62,9 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; import static org.junit.Assert.fail; -/** - * refer to {@link - * org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi.IoTDBMultiGroupVsMultiConsumerIT} - */ +/** refer to {@link IoTDBMultiGroupVsMultiConsumerIT} */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionArchVerification.class}) +@Category({MultiClusterIT2SubscriptionTreeArchVerification.class}) public class IoTDBSubscriptionSharingIT extends AbstractSubscriptionTripleIT { private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSubscriptionSharingIT.class); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/AbstractSubscriptionRegressionIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/AbstractSubscriptionTreeRegressionIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/AbstractSubscriptionRegressionIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/AbstractSubscriptionTreeRegressionIT.java index e3a125c66b5c..4b0164801cf1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/AbstractSubscriptionRegressionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/AbstractSubscriptionTreeRegressionIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression; +package org.apache.iotdb.subscription.it.triple.treemodel.regression; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.rpc.IoTDBConnectionException; @@ -59,10 +59,10 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.POLL_TIMEOUT_MS; -public abstract class AbstractSubscriptionRegressionIT extends AbstractSubscriptionTripleIT { +public abstract class AbstractSubscriptionTreeRegressionIT extends AbstractSubscriptionTripleIT { private static final Logger LOGGER = - LoggerFactory.getLogger(AbstractSubscriptionRegressionIT.class); + LoggerFactory.getLogger(AbstractSubscriptionTreeRegressionIT.class); private static final String DROP_DATABASE_SQL = "drop database "; protected static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java index ab73ac4b2436..d6681dee040b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.auto_create_db; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.auto_create_db; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -45,8 +45,8 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBDefaultPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBDefaultPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { public static SubscriptionTreePullConsumer consumer; private int deviceCount = 3; private static final String databasePrefix = "root.DefaultPullConsumerDataSet"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java index 3863e04b200e..f99d88b8a29c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBDefaultTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.auto_create_db; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.auto_create_db; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * TsFile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBDefaultTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBDefaultTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private SubscriptionTreePushConsumer consumer; private int deviceCount = 3; private static final String databasePrefix = "root.DefaultTsfilePushConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java index ab4051bde750..8adefca6ce49 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.auto_create_db; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.auto_create_db; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -53,8 +53,8 @@ * DataSet */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBRootDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBRootDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String pattern = "root.**"; public static SubscriptionTreePushConsumer consumer; private int deviceCount = 3; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java index 3b6562fa3247..d340363a41be 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/auto_create_db/IoTDBRootPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.auto_create_db; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.auto_create_db; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -47,8 +47,8 @@ * Tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBRootPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBRootPullConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String pattern = "root.**"; private static final String device = "root.auto_create_db.RootPullConsumeTsfile.d_0"; private static final String device2 = "root.RootPullConsumeTsfile.d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java index a4bccf9bd408..0eb3bceec3c0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/mix/IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.mix; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.mix; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -55,9 +55,9 @@ * Dataset */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) public class IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private static String topicName = "`1-group.1-consumer.db`"; private static List schemaList = new ArrayList<>(); private final String database = "root.PushConsumerPullConsumerWith1TopicShareProcessMix"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPullConsumerIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPullConsumerIT.java index afd944c51a0f..628bc858884b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPullConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.param; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.param; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.exception.SubscriptionConnectionException; @@ -29,7 +29,7 @@ import org.apache.iotdb.rpc.subscription.exception.SubscriptionRuntimeCriticalException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessage; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -58,8 +58,8 @@ import java.util.concurrent.atomic.AtomicInteger; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBTestParamPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBTestParamPullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static SubscriptionTreePullConsumer consumer; private static final String topicName = "TestParamPullConsumerTopic1"; private static final String database = "root.TestParamPullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPushConsumerIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPushConsumerIT.java index 13ba2731d0f7..8f138712fd40 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.param; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.param; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.exception.SubscriptionConnectionException; @@ -31,7 +31,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.enums.CompressionType; @@ -52,8 +52,8 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBTestParamPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBTestParamPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static SubscriptionTreePushConsumer consumer; private static final String topicName = "TestParamPushConsumerTopic1"; private static final String database = "root.TestParamPushConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamSubscriptionSessionIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamSubscriptionSessionIT.java similarity index 89% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamSubscriptionSessionIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamSubscriptionSessionIT.java index fecfdd2e0b58..10783fc7736c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamSubscriptionSessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamSubscriptionSessionIT.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.param; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.param; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.session.subscription.SubscriptionTreeSession; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.junit.Before; import org.junit.Test; @@ -31,8 +31,8 @@ import org.junit.runner.RunWith; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBTestParamSubscriptionSessionIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBTestParamSubscriptionSessionIT extends AbstractSubscriptionTreeRegressionIT { @Override @Before diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamTopicIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamTopicIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamTopicIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamTopicIT.java index 6a2c295d2c0c..3906e8fea6af 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/param/IoTDBTestParamTopicIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/param/IoTDBTestParamTopicIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.param; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.param; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.rpc.subscription.exception.SubscriptionIdentifierSemanticException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.junit.After; @@ -39,8 +39,8 @@ import java.util.Properties; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBTestParamTopicIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBTestParamTopicIT extends AbstractSubscriptionTreeRegressionIT { private static SubscriptionTreePullConsumer consumer; private static final String topicName = "TopicParam"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java index c080fbd76dee..c2eededdfdeb 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitFalseDataSetPullConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.autocommit; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.autocommit; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.Session; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessage; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -58,9 +58,9 @@ * Tests can be more focused on situations where autoCommit is true. In this case, if not explicitly committed, it is expected that all messages successfully polled by the consumer should be committed before the consumer is closed (reflected in the Pipe as no accumulated resources). */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) public class IoTDBTestAutoCommitFalseDataSetPullConsumerIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.TestAutoCommitFalseDataSetPullConsumer"; private static final String device = database + ".d_0"; private static final String topicName = "Topic_auto_commit_false"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java index d3c1642e654b..e8a45f0c1a4f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/autocommit/IoTDBTestAutoCommitTrueDataSetPullConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.autocommit; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.autocommit; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.Session; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessage; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -53,8 +53,9 @@ * pattern: device */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTestAutoCommitTrueDataSetPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTestAutoCommitTrueDataSetPullConsumerIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TestAutoCommitTrueDataSetPullConsumer"; private static final String device = database + ".d_0"; private static final String topicName = "topic_auto_commit_true"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java index 5a261368b335..583338714b86 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBDataSetPullConsumerIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.format; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.format; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -48,8 +48,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBDataSetPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBDataSetPullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBDataSetPullConsumer"; private static final String device = database + ".d_0"; private static final String topicName = "topic_format_pull_dataset"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java index 9c26dabaaa65..8cebc2110fc3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/format/IoTDBDBTsfilePullConsumerIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.format; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.format; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -48,8 +48,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBTsfilePullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBTsfilePullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBTsfilePullConsumer"; private static final String device = database + ".d_0"; private static final String topicName = "topic_format_pull_tsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java index fd9d4b4c00f0..514964784a27 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsDatasetPullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -51,8 +51,8 @@ * format: dataset */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBAllTsDatasetPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBAllTsDatasetPullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.AllTsDatasetPullConsumer"; private static final String database2 = "root.test.AllTsDatasetPullConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java index 9459ed6de968..b1221990a933 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsTsfilePullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -51,8 +51,8 @@ * format: tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBAllTsTsfilePullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBAllTsTsfilePullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.AllTsTsfilePullConsumer"; private static final String database2 = "root.AllTsTsfilePullConsumer"; private static final String topicName = "TopicAllTsTsfilePullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java index 8e2d7c06fa9a..e1ccad2513a1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBAllTsfilePullConsumerSnapshotIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -53,8 +53,8 @@ * mode: snapshot */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBAllTsfilePullConsumerSnapshotIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBAllTsfilePullConsumerSnapshotIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.AllTsfilePullConsumerSnapshot"; private static final String database2 = "root.test.AllTsfilePullConsumerSnapshot"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java index 71e983996e46..bbd845fd5070 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceDataSetPullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -50,8 +50,8 @@ * loose-range: path */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathDeviceDataSetPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathDeviceDataSetPullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.PathDeviceDataSetPullConsumer"; private static final String database2 = "root.PathDeviceDataSetPullConsumer"; private static final String topicName = "TopicPathDeviceDataSetPullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java index 8192997a066f..e67deb800272 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBPathDeviceTsfilePullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -51,8 +51,8 @@ * loose-range: time */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathDeviceTsfilePullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathDeviceTsfilePullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.PathDeviceTsfilePullConsumer"; private static final String database2 = "root.PathDeviceTsfilePullConsumer"; private static final String topicName = "TopicPathDeviceTsfilePullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java index e4da42871a01..e5964833cb31 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsDatasetPullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -51,8 +51,8 @@ * accurate time range */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeTsDatasetPullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeTsDatasetPullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TimeTsDatasetPullConsumer"; private static final String database2 = "root.TimeTsDatasetPullConsumer"; private static final String topicName = "TopicTimeTsDatasetPullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java index 0df6b6b04fbe..1a55940c14d4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/loose_range/IoTDBTimeTsTsfilePullConsumerIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -50,8 +50,8 @@ * format: tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeTsTsfilePullConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeTsTsfilePullConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TimeTsTsfilePullConsumer"; private static final String database2 = "root.TimeTsTsfilePullConsumer"; private static final String topicName = "TopicTimeTsTsfilePullConsumer"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java index 57030c1f28ca..7ee15fdcbd1b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerDataSetIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.mode; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.mode; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -45,8 +45,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBSnapshotDevicePullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBSnapshotDevicePullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.SnapshotDevicePullConsumerDataSet"; private static final String database2 = "root.SnapshotDevicePullConsumerDataSet"; private static final String topicName = "topicSnapshotDevicePullConsumerDataSet"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java index 15a8d7ab9f16..b865eb8282ed 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/mode/IoTDBSnapshotDevicePullConsumerTsfileIT.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.mode; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.mode; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -50,8 +50,8 @@ * tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBSnapshotDevicePullConsumerTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBSnapshotDevicePullConsumerTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.SnapshotDevicePullConsumerTsfile"; private static final String database2 = "root.SnapshotDevicePullConsumerTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java index 1c7e1ccc66b2..05b061f733c3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,9 +44,9 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) public class IoTDBConsumer2With1TopicShareProcessDataSetIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.Consumer2With1TopicShareProcessDataSet"; private static final String device = database + ".d_0"; private static final String topicName = "topicConsumer2With1TopicShareProcessDataSet"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java index 5461d8f60ec3..bcbf6d12ed35 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -52,8 +52,9 @@ * Same group pull consumer share progress */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBConsumer2With1TopicShareProcessTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBConsumer2With1TopicShareProcessTsfileIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.Consumer2With1TopicShareProcessTsfile"; private static final String device = database + ".d_0"; private static final String topicName = "topicConsumer2With1TopicShareProcessTsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java index 0ed23fde3249..03dae24d398c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBMultiGroupVsMultiConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBMultiGroupVsMultiConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.pullMultiGroupVsMultiConsumer"; private static final String device = database + ".d_0"; private static List schemaList = new ArrayList<>(); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java index c0be13472e2c..88a810e18ce5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,8 @@ * 1 consumer subscribes to 2 topics: fixed time range */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsDatasetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsDatasetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsDataset"; private static final String device = database + ".d_0"; private static List schemaList = new ArrayList<>(); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java index 6cd20553d654..e19f0908ad5b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessage; import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -61,8 +61,8 @@ * 1 consumer subscribes to 2 topics: Historical data */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsMixIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsMixIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsMix"; private static final String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java index 6b802118cd46..a9fecef2dc90 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -48,8 +48,8 @@ * 1 consumer subscribes to 2 topics: historical data */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsTsfile"; private static final String device = database + ".d_0"; private static List schemaList = new ArrayList<>(); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java index a9d9614945a7..b2eee482e812 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,8 @@ * Tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBPatternPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBPatternPullConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBPatternPullConsumeTsfile"; private static final String database2 = "root.DBPatternPullConsumeTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java index f9f271eabc30..d403c0005f99 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDBPatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -48,8 +48,8 @@ * pattern:db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBPatternPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBPatternPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBPatternPullConsumerDataSet"; private static final String database2 = "root.DBPatternPullConsumerDataSet"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java index 59ff02e79dcc..271755144e1a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDefaultPatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDefaultPatternPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDefaultPatternPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DefaultPatternPullConsumerDataSet"; private static final String database2 = "root.DefaultPatternPullConsumerDataSet"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java index 9e7f938f30ba..398147e9e00d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,8 @@ * Tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDevicePatternPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDevicePatternPullConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DevicePatternPullConsumeTsfile"; private static final String database2 = "root.DevicePatternPullConsumeTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java index 8238f53eee94..2cad94fc4ac7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBDevicePatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDevicePatternPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDevicePatternPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DevicePatternPullConsumerDataSet"; private static final String database2 = "root.DevicePatternPullConsumerDataSet"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java index e117929fdb1e..7517ae5ba863 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatch2PatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,9 +49,9 @@ * time-range: history */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) public class IoTDBMiddleMatch2PatternPullConsumerDataSetIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.MiddleMatch2PatternPullConsumerDataSet"; private static final String database2 = "root.MiddleMatch2PatternPullConsumerDataSet"; private static List devices = new ArrayList<>(3); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java index cb109b152350..2572c41de936 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,9 @@ * Tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBMiddleMatchPatternPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBMiddleMatchPatternPullConsumeTsfileIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.MiddleMatchPatternPullConsumeTsfile"; private static final String database2 = "root.MiddleMatchPatternPullConsumeTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java index 95d4540adbc0..9fb2c072b06a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBMiddleMatchPatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,9 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBMiddleMatchPatternPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBMiddleMatchPatternPullConsumerDataSetIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.MiddleMatchPatternPullConsumerDataSet"; private static final String database2 = "root.MiddleMatchPatternPullConsumerDataSet"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java index 1f4cf97721f8..7c88dec3f806 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBRootPatternPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,8 @@ * Tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBRootPatternPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBRootPatternPullConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.RootPatternPullConsumeTsfile"; private static final String device = database + ".d_0"; private static final String topicName = "topicRootPatternPullConsumeTsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java index 04aa97a0d18b..060d475d89b6 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumeTsfileIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -50,8 +50,8 @@ * tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTSPatternPullConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTSPatternPullConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBPatternPullConsumeTsfile"; private static final String database2 = "root.DBPatternPullConsumeTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java index 5d69f22605fa..a47d53ccdb80 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/pattern/IoTDBTSPatternPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTSPatternPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTSPatternPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TSPatternPullConsumerDataSet"; private static final String device = database + ".d_0"; private static final String topicName = "topicTSPatternPullConsumerDataSet"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java index 77bcc0c2e116..c86a86373c41 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBAllPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBAllPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBAllPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.AllPullConsumerDataSet"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java index c9bb13aa2944..004b5928fc8d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBHistoryPullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBHistoryPullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBHistoryPullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.HistoryPullConsumerDataSet"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java index 91ed8f7f972e..25511d1b9e3e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBRealTimePullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,8 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBRealTimePullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBRealTimePullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.RealTimePullConsumerDataSet"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java similarity index 93% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java index 8d6d097c5599..fcfd21695833 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangeAccuratePullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -44,8 +44,9 @@ import java.util.List; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeRangeAccuratePullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeRangeAccuratePullConsumerDataSetIT + extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeRangeAccuratePullConsumerDataSet"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java index 9b8d6688f805..e490ea525690 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pullconsumer/time/IoTDBTimeRangePullConsumerDataSetIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pullconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pullconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -47,8 +47,8 @@ * Start time, end time are both closed intervals. If not specified, the time will be 00:00:00. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeRangePullConsumerDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeRangePullConsumerDataSetIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeRangePullConsumerDataSet"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java index 37ee4c19b077..89cb0a11e43a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeDataSetIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.format; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.format; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -56,8 +56,8 @@ * pattern: root.** */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTestPushConsumeDataSetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTestPushConsumeDataSetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TestPushConsumeDataSet"; private static final String topicName = "topic_TestPushConsumeDataSet"; private static List schemaList = new ArrayList<>(); diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java index 954816ba6f9e..a0ede5acca8f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeNoTargetDirTsfileIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.format; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.format; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -62,8 +62,8 @@ * group_id: no */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTestPushConsumeNoTargetDirTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTestPushConsumeNoTargetDirTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TestPushConsumeNoTargetDirTsfile"; private static final String device = database + ".d_0"; private static final String topicName = "topic_TestPushConsumeNoTargetDirTsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java index 9e251f334ab8..b14a9bccf697 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/format/IoTDBTestPushConsumeTsfileIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.format; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.format; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -60,8 +60,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTestPushConsumeTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTestPushConsumeTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TestPushConsumeTsfile"; private static final String device = database + ".d_0"; private static final String topicName = "topic_TestPushConsumeTsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java index f50f4d2c03d4..7a1b270da452 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -57,8 +57,8 @@ * mode: live */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBLooseAllTsDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBLooseAllTsDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.LooseAllTsDatasetPushConsumer"; private static final String database2 = "root.LooseAllTsDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java index c206ca82ddc1..dc4dac80a3c0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsDatasetPushConsumerSnapshotIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -57,8 +57,9 @@ * mode: snapshot */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBLooseAllTsDatasetPushConsumerSnapshotIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBLooseAllTsDatasetPushConsumerSnapshotIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.LooseAllTsDatasetPushConsumerSnapshot"; private static final String database2 = "root.LooseAllTsDatasetPushConsumerSnapshot"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java index 5357a8934466..16ff58f4e9c4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBLooseAllTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -63,8 +63,8 @@ * loose-range: all */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBLooseAllTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBLooseAllTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.LooseAllTsfilePushConsumer"; private String device = database + ".d_0"; private String device2 = database + ".d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java index 82b4d42c74eb..dcd9065032e4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseDeviceTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -62,8 +62,8 @@ * push consumer */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathLooseDeviceTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathLooseDeviceTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.PathLooseDeviceTsfilePushConsumer"; private String device = database + ".d_0"; private String device2 = database + ".d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java index b622e4a46a80..c41386e8a3e0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -57,8 +57,8 @@ * loose-range: path */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathLooseTsDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathLooseTsDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.PathLooseTsDatasetPushConsumer"; private static final String database2 = "root.PathLooseTsDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java index e1baaf17dbad..a381ef02f548 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathLooseTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * push consumer */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathLooseTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathLooseTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.PathLooseTsfilePushConsumer"; private String device = database + ".d_0"; private String device2 = database + ".d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java index fc99cfadb9cf..f9fbe32a7457 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBPathTsLooseDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -55,8 +55,8 @@ * pattern: ts */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBPathTsLooseDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBPathTsLooseDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.PathTsLooseDatasetPushConsumer"; private static final String database2 = "root.PathTsLooseDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java index af2e8873fff1..d298246e17e3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -58,8 +58,8 @@ * live */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeLooseTsDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeLooseTsDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TimeLooseTsDatasetPushConsumer"; private static final String database2 = "root.TimeLooseTsDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java similarity index 97% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java index b21dd691815f..26f4b1542748 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -62,8 +62,8 @@ * format: tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeLooseTsTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeLooseTsTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeLooseTsTsfilePushConsumer"; private String device = database + ".d_0"; private String device2 = database + ".d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java index 4691dd2be7f6..3f9ed14b22f2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeLooseTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -56,8 +56,8 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeLooseTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeLooseTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeLooseTsfilePushConsumer"; private String device = database + ".d_0"; private String device2 = database + ".d_1"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java index 06430c8fa6bf..3a9d1b24b746 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/loose_range/IoTDBTimeTsLooseDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.loose_range; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.loose_range; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -57,8 +57,8 @@ * live */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeTsLooseDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeTsLooseDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TimeTsLooseDatasetPushConsumer"; private static final String database2 = "root.TimeTsLooseDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java index d9b1bcc19b65..d003cbceaeda 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternDatasetPushConsumerIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.mode; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.mode; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -55,8 +55,9 @@ * pattern: ts */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBSnapshotTSPatternDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBSnapshotTSPatternDatasetPushConsumerIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.SnapshotTSPatternDatasetPushConsumer"; private static final String database2 = "root.SnapshotTSPatternDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java index 5a0cba8a2969..2b34045e463b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/mode/IoTDBSnapshotTSPatternTsfilePushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.mode; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.mode; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.subscription.config.TopicConstant; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -62,8 +62,9 @@ * pattern: ts */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBSnapshotTSPatternTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBSnapshotTSPatternTsfilePushConsumerIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.SnapshotTSPatternTsfilePushConsumer"; private static final String database2 = "root.SnapshotTSPatternTsfilePushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java index 1ed380932d85..0bca36eaa1b6 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessDataSetIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -55,9 +55,9 @@ * Dataset */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) public class IoTDBConsumer2With1TopicShareProcessDataSetIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.Consumer2With1TopicShareProcessDataSet"; private static final String device = database + ".d_0"; private static final String topicName = "topic_Consumer2With1TopicShareProcessDataSet"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java index f0e9d7204b23..92a8caa126b5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,9 @@ * tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBConsumer2With1TopicShareProcessTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBConsumer2With1TopicShareProcessTsfileIT + extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.Consumer2With1TopicShareProcessTsfile"; private static final String device = database + ".d_0"; private static final String topicName = "topic_Consumer2With1TopicShareProcessTsfile"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java index 789a924bcee0..17fa08cd9e2c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBMultiGroupVsMultiConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -67,8 +67,8 @@ * |c9|t0,t3|g3| dataset(dest2)/tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBMultiGroupVsMultiConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBMultiGroupVsMultiConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String topicNamePrefix = "topic_pushMultiGroupVsMultiConsumer_"; private String databasePrefix = "root.test.pushMultiGroupVsMultiConsumer_"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java index 68a20dad54e9..e35e7f510a5d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsDatasetIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * dataset */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsDatasetIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsDatasetIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsDataset"; private static final String database2 = "root.OneConsumerMultiTopicsDataset"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java index 2357a13c4f33..1c7ee93c83ed 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsMixIT.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; @@ -28,7 +28,7 @@ import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionMessageType; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -61,8 +61,8 @@ * The timing of flush is very critical. If the data inside the filter and the data outside the filter are within one tsfile, they will all be extracted. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsMixIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsMixIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsMix"; private static final String database2 = "root.OneConsumerMultiTopicsMix"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java index d89e020d7a5d..f3be9db507d4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/multi/IoTDBOneConsumerMultiTopicsTsfileIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.multi; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.multi; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * The timing of flush is very critical. If the data inside the filter and the data outside the filter are within one tsfile, they will all be extracted. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBOneConsumerMultiTopicsTsfileIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBOneConsumerMultiTopicsTsfileIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OneConsumerMultiTopicsTsfile"; private static final String database2 = "root.OneConsumerMultiTopicsTsfile"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java index 5e354dce0419..59e93506fe4e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBPatternDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBPatternDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBPatternDatasetPushConsumer"; private static final String database2 = "root.DBPatternDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java index 3e0bd29ed920..96e6a93873b8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDBPatternTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDBPatternTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDBPatternTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DBPatternTsfilePushConsumer"; private static final String database2 = "root.DBPatternTsfilePushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java index 452a84729d24..d2fa1d2fdcd2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDefaultPatternTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * pattern: root.** */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDefaultPatternTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDefaultPatternTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DefaultPatternTsfilePushConsumer"; private static final String database2 = "root.DefaultPatternTsfilePushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java index eaf70d7d408b..1cb49af0dccf 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * pattern: device */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDevicePatternDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDevicePatternDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DevicePatternDatasetPushConsumer"; private static final String database2 = "root.DevicePatternDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java index dea7f8352d81..2e4b816c48a5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBDevicePatternTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -61,8 +61,8 @@ * pattern: device */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBDevicePatternTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBDevicePatternTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.DevicePatternTsfilePushConsumer"; private static final String database2 = "root.DevicePatternTsfilePushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java index 2b7c52dfc6ad..0ab26ee49675 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBRootPatternDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * pattern: db */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBRootPatternDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBRootPatternDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.RootPatternDatasetPushConsumer"; private static final String database2 = "root.RootPatternDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java index 37b03e3c757c..f4462e9a50ca 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * pattern: ts */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTSPatternDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTSPatternDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TSPatternDatasetPushConsumer"; private static final String database2 = "root.TSPatternDatasetPushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java similarity index 96% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java index a59dcb362427..7d0953c15927 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/pattern/IoTDBTSPatternTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.pattern; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.pattern; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -60,8 +60,8 @@ * pattern: ts */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTSPatternTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTSPatternTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.TSPatternTsfilePushConsumer"; private static final String database2 = "root.TSPatternTsfilePushConsumer"; private static final String device = database + ".d_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java index 4ec3b8a01fd3..23cf1c0270f1 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ * dataset */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBHistoryRootDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBHistoryRootDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.HistoryRootDatasetPushConsumer"; private String device = database + ".d_0"; private String pattern = "root.**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java index b33fd8593963..ac661e6deac3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBHistoryRootTsFilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -59,8 +59,8 @@ * pattern: root */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBHistoryRootTsFilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBHistoryRootTsFilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.HistoryRootTsFilePushConsumer"; private String device = database + ".d_0"; private String pattern = "root.**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java index 44b4f87e6f0f..08c8bbee3168 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBDatasetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,8 +49,8 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBRealTimeDBDatasetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBRealTimeDBDatasetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.RealTimeDBDatasetPushConsumer"; private String device = database + ".d_0"; private String pattern = database + ".**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java index 3e465bb97103..97452236b6b8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBRealTimeDBTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -54,8 +54,8 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBRealTimeDBTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBRealTimeDBTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.RealTimeDBTsfilePushConsumer"; private String device = database + ".d_0"; private String pattern = database + ".**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java index 25ba69ad64ee..ac3b64fc8ffc 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeAccurateDBDataSetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -49,9 +49,9 @@ import static org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT; @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) public class IoTDBTimeRangeAccurateDBDataSetPushConsumerIT - extends AbstractSubscriptionRegressionIT { + extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeRangeAccurateDBDataSetPushConsumer"; private String device = database + ".d_0"; private String pattern = database + ".**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java index d2bcf5ca45e7..10a2ddb8c920 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBDataSetPushConsumerIT.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; import org.apache.iotdb.session.subscription.payload.SubscriptionSessionDataSet; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -52,8 +52,8 @@ * Start time, end time are both closed intervals. If not specified, the time will be 00:00:00. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeRangeDBDataSetPushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeRangeDBDataSetPushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeRangeDBDataSetPushConsumer"; private String device = database + ".d_0"; private String pattern = database + ".**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java index fa97e511f30a..7ac75f60e16f 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/pushconsumer/time/IoTDBTimeRangeDBTsfilePushConsumerIT.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.pushconsumer.time; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.pushconsumer.time; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionConsumer; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.AckStrategy; import org.apache.iotdb.session.subscription.consumer.ConsumeResult; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePushConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -57,8 +57,8 @@ * Start time, end time are both closed intervals. If not specified, the time will be 00:00:00. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionConsumer.class}) -public class IoTDBTimeRangeDBTsfilePushConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionConsumer.class}) +public class IoTDBTimeRangeDBTsfilePushConsumerIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TimeRangeDBTsfilePushConsumer"; private String device = database + ".d_0"; private String pattern = database + ".**"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java similarity index 94% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java index 022aa2a0df77..2747e6dbc233 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBDataSet1TopicConsumerSpecialIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.topic; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.topic; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -47,8 +47,8 @@ * Sequence-level topic, with start, end, tsfile */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBDataSet1TopicConsumerSpecialIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBDataSet1TopicConsumerSpecialIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.test.ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz1"; private String device = database + ".`#01`"; private String pattern = device + ".`ABH#01`"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBTestTopicNameIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBTestTopicNameIT.java similarity index 93% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBTestTopicNameIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBTestTopicNameIT.java index c20c4d081577..45cddf8ebfe8 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/topic/IoTDBTestTopicNameIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/topic/IoTDBTestTopicNameIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.topic; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.topic; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -47,8 +47,8 @@ * Special topic name */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBTestTopicNameIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBTestTopicNameIT extends AbstractSubscriptionTreeRegressionIT { private String database = "root.TestTopicName"; private String device = database + ".d_0"; private String pattern = device + ".s_0"; diff --git a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/user/IoTDBOtherUserConsumerIT.java b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/user/IoTDBOtherUserConsumerIT.java similarity index 95% rename from integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/user/IoTDBOtherUserConsumerIT.java rename to integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/user/IoTDBOtherUserConsumerIT.java index 7b3c01635a6a..470d6ab1b39b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/user/IoTDBOtherUserConsumerIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/treemodel/regression/user/IoTDBOtherUserConsumerIT.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.subscription.it.triple.regression.user; +package org.apache.iotdb.subscription.it.triple.treemodel.regression.user; import org.apache.iotdb.it.framework.IoTDBTestRunner; -import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc; +import org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionTreeRegressionMisc; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.session.subscription.consumer.tree.SubscriptionTreePullConsumer; -import org.apache.iotdb.subscription.it.triple.regression.AbstractSubscriptionRegressionIT; +import org.apache.iotdb.subscription.it.triple.treemodel.regression.AbstractSubscriptionTreeRegressionIT; import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; @@ -46,8 +46,8 @@ * Permission Test: Username currently only serves for connection, no permissions defined. */ @RunWith(IoTDBTestRunner.class) -@Category({MultiClusterIT2SubscriptionRegressionMisc.class}) -public class IoTDBOtherUserConsumerIT extends AbstractSubscriptionRegressionIT { +@Category({MultiClusterIT2SubscriptionTreeRegressionMisc.class}) +public class IoTDBOtherUserConsumerIT extends AbstractSubscriptionTreeRegressionIT { private static final String database = "root.test.OtherUserConsumer"; private static final String device = database + ".d_0"; private static final String topicName = "topic_OtherUserConsumer";