Skip to content

Commit 2e88860

Browse files
VGalaxiesVGalaxies
authored
Subscription: split client and example modules (#17306)
* refactor(subscription): split client and example modules * build(service-rpc): drop unused pipe-api dependency * build(subscription): declare direct client dependencies
1 parent 75364c2 commit 2e88860

File tree

111 files changed

+146
-5
lines changed

Some content is hidden

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

111 files changed

+146
-5
lines changed

‎example/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<module>rest-java-example</module>
3939
<module>schema</module>
4040
<module>session</module>
41+
<module>subscription</module>
4142
<module>trigger</module>
4243
<module>udf</module>
4344
</modules>

‎example/subscription/pom.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
<parent>
25+
<groupId>org.apache.iotdb</groupId>
26+
<artifactId>iotdb-examples</artifactId>
27+
<version>2.0.7-SNAPSHOT</version>
28+
</parent>
29+
<artifactId>subscription-example</artifactId>
30+
<name>IoTDB: Example: Subscription Client</name>
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.apache.iotdb</groupId>
34+
<artifactId>iotdb-subscription</artifactId>
35+
<version>${project.version}</version>
36+
</dependency>
37+
</dependencies>
38+
</project>

example/session/src/main/java/org/apache/iotdb/SubscriptionSessionExample.java renamed to example/subscription/src/main/java/org/apache/iotdb/SubscriptionSessionExample.java

File renamed without changes.

example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java renamed to example/subscription/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java

File renamed without changes.

‎integration-test/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@
9494
<artifactId>iotdb-session</artifactId>
9595
<version>2.0.7-SNAPSHOT</version>
9696
</dependency>
97+
<dependency>
98+
<groupId>org.apache.iotdb</groupId>
99+
<artifactId>iotdb-subscription</artifactId>
100+
<version>2.0.7-SNAPSHOT</version>
101+
</dependency>
97102
<dependency>
98103
<groupId>org.apache.iotdb</groupId>
99104
<artifactId>iotdb-jdbc</artifactId>

‎iotdb-client/cli/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
<artifactId>iotdb-session</artifactId>
4040
<version>2.0.7-SNAPSHOT</version>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.iotdb</groupId>
44+
<artifactId>iotdb-subscription</artifactId>
45+
<version>2.0.7-SNAPSHOT</version>
46+
</dependency>
4247
<dependency>
4348
<groupId>org.apache.iotdb</groupId>
4449
<artifactId>iotdb-jdbc</artifactId>

‎iotdb-client/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<module>jdbc</module>
3737
<module>service-rpc</module>
3838
<module>session</module>
39+
<module>subscription</module>
3940
</modules>
4041
<profiles>
4142
<profile>

‎iotdb-client/service-rpc/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040
<artifactId>common</artifactId>
4141
<version>${tsfile.version}</version>
4242
</dependency>
43-
<dependency>
44-
<groupId>org.apache.iotdb</groupId>
45-
<artifactId>pipe-api</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
4843
<dependency>
4944
<groupId>org.apache.tsfile</groupId>
5045
<artifactId>tsfile</artifactId>

‎iotdb-client/subscription/pom.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
<modelVersion>4.0.0</modelVersion>
24+
<parent>
25+
<groupId>org.apache.iotdb</groupId>
26+
<artifactId>iotdb-client</artifactId>
27+
<version>2.0.7-SNAPSHOT</version>
28+
</parent>
29+
<artifactId>iotdb-subscription</artifactId>
30+
<name>IoTDB: Client: Subscription</name>
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.apache.iotdb</groupId>
34+
<artifactId>pipe-api</artifactId>
35+
<version>2.0.7-SNAPSHOT</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.apache.iotdb</groupId>
39+
<artifactId>isession</artifactId>
40+
<version>2.0.7-SNAPSHOT</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.apache.iotdb</groupId>
44+
<artifactId>iotdb-session</artifactId>
45+
<version>2.0.7-SNAPSHOT</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.apache.iotdb</groupId>
49+
<artifactId>service-rpc</artifactId>
50+
<version>2.0.7-SNAPSHOT</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.apache.iotdb</groupId>
54+
<artifactId>iotdb-thrift-commons</artifactId>
55+
<version>2.0.7-SNAPSHOT</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.apache.iotdb</groupId>
59+
<artifactId>iotdb-thrift</artifactId>
60+
<version>2.0.7-SNAPSHOT</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.apache.tsfile</groupId>
64+
<artifactId>common</artifactId>
65+
<version>${tsfile.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.apache.tsfile</groupId>
69+
<artifactId>tsfile</artifactId>
70+
<version>${tsfile.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.slf4j</groupId>
74+
<artifactId>slf4j-api</artifactId>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.apache.thrift</groupId>
78+
<artifactId>libthrift</artifactId>
79+
</dependency>
80+
</dependencies>
81+
</project>

iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/annotation/TableModel.java renamed to iotdb-client/subscription/src/main/java/org/apache/iotdb/rpc/subscription/annotation/TableModel.java

File renamed without changes.

0 commit comments

Comments
 (0)