Skip to content

Commit

Permalink
fixup! Subscription IT: intro extensive regression tests from test gr…
Browse files Browse the repository at this point in the history
…oup (apache#13065)
  • Loading branch information
VGalaxies committed Aug 19, 2024
1 parent 14b8623 commit a97137b
Show file tree
Hide file tree
Showing 79 changed files with 79 additions and 158 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.thrift.TException;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -49,7 +48,7 @@ public class IoTDBDefaultPullConsumerDataSetIT extends AbstractSubscriptionRegre
private int deviceCount = 3;
private static final String databasePrefix = "root.DefaultPullConsumerDataSet";
private static String topicName = "topic_autodb_DefaultPullConsumerDataSet";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.apache.tsfile.read.expression.QueryExpression;
import org.apache.tsfile.read.query.dataset.QueryDataSet;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -65,7 +64,7 @@ public class IoTDBDefaultTsfilePushConsumerIT extends AbstractSubscriptionRegres
private int deviceCount = 3;
private static final String databasePrefix = "root.DefaultTsfilePushConsumer";
private static String topicName = "topicDefaultTsfilePushConsumer";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.thrift.TException;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -61,7 +60,7 @@ public class IoTDBRootDatasetPushConsumerIT extends AbstractSubscriptionRegressi
private static final String databasePrefix = "root.RootDatasetPushConsumer";
private static final String database2 = "root.RootDatasetPushConsumer2.test";
private static String topicName = "topicAutoCreateDB_RootDatasetPushConsumer";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.thrift.TException;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -54,7 +53,7 @@ public class IoTDBRootPullConsumeTsfileIT extends AbstractSubscriptionRegression
private static final String device2 = "root.RootPullConsumeTsfile.d_1";
public static SubscriptionPullConsumer consumer;
private static String topicName = "topicAutoCreateDB_RootPullConsumeTsfile";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -59,7 +58,7 @@
public class IoTDBPushConsumerPullConsumerWith1TopicShareProcessMixIT
extends AbstractSubscriptionRegressionIT {
private static String topicName = "`1-group.1-consumer.db`";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();
private final String database = "root.PushConsumerPullConsumerWith1TopicShareProcessMix";
private final String device = database + ".d_0";
private final String pattern = database + ".**";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -66,7 +65,7 @@ public class IoTDBTestAutoCommitFalseDataSetPullConsumerIT
private static final String topicName = "Topic_auto_commit_false";
private String pattern = device + ".**";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -60,7 +59,7 @@ public class IoTDBTestAutoCommitTrueDataSetPullConsumerIT extends AbstractSubscr
private static final String topicName = "topic_auto_commit_true";
private String pattern = device + ".**";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -55,7 +54,7 @@ public class IoTDBDBDataSetPullConsumerIT extends AbstractSubscriptionRegression
private static final String topicName = "topic_format_pull_dataset";
private static final String pattern = database + ".**";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -55,7 +54,7 @@ public class IoTDBDBTsfilePullConsumerIT extends AbstractSubscriptionRegressionI
private static final String topicName = "topic_format_pull_tsfile";
private static final String pattern = database + ".**";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -59,7 +58,7 @@ public class IoTDBAllTsDatasetPullConsumerIT extends AbstractSubscriptionRegress
private String device2 = database + ".d_1";
private static final String pattern = device + ".s_0";
private static final String topicName = "topic_loose_range_all_pull_dataset";
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();
private SubscriptionPullConsumer consumer;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class IoTDBAllTsTsfilePullConsumerIT extends AbstractSubscriptionRegressi
private static final String pattern = device + ".s_0";
private static final String device2 = database + ".d_1";
private static SubscriptionPullConsumer consumer;
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();
private long nowTimestamp;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -62,7 +61,7 @@ public class IoTDBAllTsfilePullConsumerSnapshotIT extends AbstractSubscriptionRe
private static final String pattern = device + ".s_0";
private static final String device2 = database + ".d_1";
private static SubscriptionPullConsumer consumer;
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();
private long nowTimestamp;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -59,7 +58,7 @@ public class IoTDBPathDeviceDataSetPullConsumerIT extends AbstractSubscriptionRe
private String pattern = device + ".**";
private String device2 = database + ".d_1";
private static SubscriptionPullConsumer consumer;
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class IoTDBPathDeviceTsfilePullConsumerIT extends AbstractSubscriptionReg
private static final String pattern = device + ".**";
private static final String device2 = database + ".d_1";
private static SubscriptionPullConsumer consumer;
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class IoTDBTimeTsDatasetPullConsumerIT extends AbstractSubscriptionRegres
private String device2 = database + ".d_1";
private String device3 = database2 + ".d_2";
private String pattern = device + ".s_0";
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();
private SubscriptionPullConsumer consumer;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class IoTDBTimeTsTsfilePullConsumerIT extends AbstractSubscriptionRegress
private static final String device2 = database + ".d_1";
private static final String device3 = database2 + ".d_2";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();
private static List<Integer> rowCountList;
private long nowTimestamp;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -54,7 +53,7 @@ public class IoTDBSnapshotDevicePullConsumerDataSetIT extends AbstractSubscripti

private String pattern = device + ".**";
private static SubscriptionPullConsumer consumer;
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -58,7 +57,7 @@ public class IoTDBSnapshotDevicePullConsumerTsfileIT extends AbstractSubscriptio
private static final String topicName = "topicSnapshotDevicePullConsumerTsfile";
private static final String pattern = device + ".**";
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -53,7 +52,7 @@ public class IoTDBConsumer2With1TopicShareProcessDataSetIT
private String pattern = device + ".**";
private SubscriptionPullConsumer consumer2;
private static SubscriptionPullConsumer consumer;
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

@Override
@Before
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -58,7 +57,7 @@ public class IoTDBConsumer2With1TopicShareProcessTsfileIT extends AbstractSubscr
private static final String database = "root.test.Consumer2With1TopicShareProcessTsfile";
private static final String device = database + ".d_0";
private static final String topicName = "topicConsumer2With1TopicShareProcessTsfile";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();
private String pattern = device + ".**";
private SubscriptionPullConsumer consumer2;
private static SubscriptionPullConsumer consumer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -48,7 +47,7 @@
public class IoTDBMultiGroupVsMultiConsumerIT extends AbstractSubscriptionRegressionIT {
private static final String database = "root.test.pullMultiGroupVsMultiConsumer";
private static final String device = database + ".d_0";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();
private String topicNamePrefix = "TopicPullMultiGroupVsMultiConsumer_";
private int tsCount = 10;
private int consumertCount = 10;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand All @@ -53,7 +52,7 @@
public class IoTDBOneConsumerMultiTopicsDatasetIT extends AbstractSubscriptionRegressionIT {
private static final String database = "root.test.OneConsumerMultiTopicsDataset";
private static final String device = database + ".d_0";
private static List<IMeasurementSchema> schemaList = new ArrayList<>();
private static List<MeasurementSchema> schemaList = new ArrayList<>();

private String pattern = device + ".s_0";
private String pattern2 = device + ".s_1";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.apache.tsfile.read.expression.QueryExpression;
import org.apache.tsfile.read.query.dataset.QueryDataSet;
import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -69,7 +68,7 @@ public class IoTDBOneConsumerMultiTopicsMixIT extends AbstractSubscriptionRegres
private String pattern2 = "root.**";
private String topicName = "topic1_OneConsumerMultiTopicsMix";
private String topicName2 = "topic2_OneConsumerMultiTopicsMix";
private List<IMeasurementSchema> schemaList = new ArrayList<>();
private List<MeasurementSchema> schemaList = new ArrayList<>();
private SubscriptionPullConsumer consumer;

@Override
Expand Down
Loading

0 comments on commit a97137b

Please sign in to comment.