Skip to content

Commit 886bb28

Browse files
authored
Collector: Remove iotdb-tsfile dependence & Upgrade tsfile version & Modify compile-check from package to verify. (#65)
1 parent 22de260 commit 886bb28

File tree

8 files changed

+22
-64
lines changed

8 files changed

+22
-64
lines changed

.github/workflows/compile-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
- name: Compiler Test
4848
shell: bash
4949
run: |
50-
mvn clean package -P with-integration-tests -ntp
50+
mvn clean verify -P with-integration-tests -ntp

iotdb-collector/collector-core/pom.xml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
<dependency>
6060
<groupId>org.apache.tsfile</groupId>
6161
<artifactId>tsfile</artifactId>
62-
<version>2.1.0-250325-SNAPSHOT</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.apache.iotdb</groupId>
66-
<artifactId>tsfile</artifactId>
67-
<version>1.3.2</version>
6862
</dependency>
6963
<dependency>
7064
<groupId>jakarta.servlet</groupId>
@@ -106,22 +100,10 @@
106100
<groupId>com.lmax</groupId>
107101
<artifactId>disruptor</artifactId>
108102
</dependency>
109-
<dependency>
110-
<groupId>org.java-websocket</groupId>
111-
<artifactId>Java-WebSocket</artifactId>
112-
</dependency>
113103
<dependency>
114104
<groupId>org.apache.commons</groupId>
115105
<artifactId>commons-lang3</artifactId>
116106
</dependency>
117-
<dependency>
118-
<groupId>org.apache.commons</groupId>
119-
<artifactId>commons-collections4</artifactId>
120-
</dependency>
121-
<dependency>
122-
<groupId>org.apache.commons</groupId>
123-
<artifactId>commons-pool2</artifactId>
124-
</dependency>
125107
<dependency>
126108
<groupId>org.apache.iotdb</groupId>
127109
<artifactId>iotdb-thrift-commons</artifactId>
@@ -134,14 +116,6 @@
134116
<groupId>org.apache.iotdb</groupId>
135117
<artifactId>iotdb-session</artifactId>
136118
</dependency>
137-
<dependency>
138-
<groupId>net.java.dev.jna</groupId>
139-
<artifactId>jna</artifactId>
140-
</dependency>
141-
<dependency>
142-
<groupId>net.java.dev.jna</groupId>
143-
<artifactId>jna-platform</artifactId>
144-
</dependency>
145119
<dependency>
146120
<groupId>org.apache.thrift</groupId>
147121
<artifactId>libthrift</artifactId>
@@ -150,30 +124,10 @@
150124
<groupId>com.google.guava</groupId>
151125
<artifactId>guava</artifactId>
152126
</dependency>
153-
<dependency>
154-
<groupId>org.eclipse.milo</groupId>
155-
<artifactId>stack-core</artifactId>
156-
</dependency>
157-
<dependency>
158-
<groupId>org.eclipse.milo</groupId>
159-
<artifactId>sdk-core</artifactId>
160-
</dependency>
161-
<dependency>
162-
<groupId>org.eclipse.milo</groupId>
163-
<artifactId>stack-server</artifactId>
164-
</dependency>
165-
<dependency>
166-
<groupId>org.eclipse.milo</groupId>
167-
<artifactId>sdk-server</artifactId>
168-
</dependency>
169127
<dependency>
170128
<groupId>org.apache.tsfile</groupId>
171129
<artifactId>common</artifactId>
172130
</dependency>
173-
<dependency>
174-
<groupId>io.moquette</groupId>
175-
<artifactId>moquette-broker</artifactId>
176-
</dependency>
177131
<dependency>
178132
<groupId>com.google.code.findbugs</groupId>
179133
<artifactId>jsr305</artifactId>
@@ -198,6 +152,10 @@
198152
<groupId>com.github.ben-manes.caffeine</groupId>
199153
<artifactId>caffeine</artifactId>
200154
</dependency>
155+
<dependency>
156+
<groupId>commons-codec</groupId>
157+
<artifactId>commons-codec</artifactId>
158+
</dependency>
201159
</dependencies>
202160
<build>
203161
<resources>
@@ -217,9 +175,11 @@
217175
<configuration>
218176
<usedDependencies>
219177
<!-- For some reason the plugin complains if this artifact is included -->
178+
<usedDependency>ch.qos.logback:logback-classic</usedDependency>
220179
<usedDependency>org.eclipse.jetty:jetty-http</usedDependency>
221180
<usedDependency>org.eclipse.jetty:jetty-util</usedDependency>
222181
<usedDependency>org.glassfish.jersey.inject:jersey-hk2</usedDependency>
182+
<usedDependency>org.xerial:sqlite-jdbc</usedDependency>
223183
</usedDependencies>
224184
</configuration>
225185
</plugin>

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/persistence/TaskPersistence.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.apache.iotdb.collector.config.TaskRuntimeOptions;
2323
import org.apache.iotdb.collector.runtime.task.TaskStateEnum;
2424
import org.apache.iotdb.collector.service.RuntimeService;
25-
import org.apache.iotdb.tsfile.utils.PublicBAOS;
26-
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
2725

26+
import org.apache.tsfile.utils.PublicBAOS;
27+
import org.apache.tsfile.utils.ReadWriteIOUtils;
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeGZIPCompressor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.iotdb.collector.plugin.builtin.sink.compressor;
2121

22-
import org.apache.iotdb.tsfile.compress.ICompressor;
23-
import org.apache.iotdb.tsfile.compress.IUnCompressor;
24-
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
22+
import org.apache.tsfile.compress.ICompressor;
23+
import org.apache.tsfile.compress.IUnCompressor;
24+
import org.apache.tsfile.file.metadata.enums.CompressionType;
2525

2626
import java.io.IOException;
2727

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZ4Compressor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.iotdb.collector.plugin.builtin.sink.compressor;
2121

22-
import org.apache.iotdb.tsfile.compress.ICompressor;
23-
import org.apache.iotdb.tsfile.compress.IUnCompressor;
24-
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
22+
import org.apache.tsfile.compress.ICompressor;
23+
import org.apache.tsfile.compress.IUnCompressor;
24+
import org.apache.tsfile.file.metadata.enums.CompressionType;
2525

2626
import java.io.IOException;
2727

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZMA2Compressor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.iotdb.collector.plugin.builtin.sink.compressor;
2121

22-
import org.apache.iotdb.tsfile.compress.ICompressor;
23-
import org.apache.iotdb.tsfile.compress.IUnCompressor;
24-
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
22+
import org.apache.tsfile.compress.ICompressor;
23+
import org.apache.tsfile.compress.IUnCompressor;
24+
import org.apache.tsfile.file.metadata.enums.CompressionType;
2525

2626
import java.io.IOException;
2727

iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeSnappyCompressor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.iotdb.collector.plugin.builtin.sink.compressor;
2121

22-
import org.apache.iotdb.tsfile.compress.ICompressor;
23-
import org.apache.iotdb.tsfile.compress.IUnCompressor;
24-
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
22+
import org.apache.tsfile.compress.ICompressor;
23+
import org.apache.tsfile.compress.IUnCompressor;
24+
import org.apache.tsfile.file.metadata.enums.CompressionType;
2525

2626
import java.io.IOException;
2727

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
</modules>
4242
<properties>
4343
<!-- Explicitly set a variable used by all dependencies to the IoTDB dependencies, as the release plugin will not update these on a release -->
44-
<iotdb.version>2.0.1-beta</iotdb.version>
45-
<tsfile.version>2.0.1</tsfile.version>
4644
<!-- This was the last version to support Java 8 -->
4745
<airlift-units.version>1.7</airlift-units.version>
4846
<airlift.version>206</airlift.version>
@@ -186,7 +184,7 @@
186184
<thrift.version>0.14.1</thrift.version>
187185
<!-- This was the last version to support Java 8 -->
188186
<tomcat.version>9.0.86</tomcat.version>
189-
<tsfile.version>2.1.0-250219-SNAPSHOT</tsfile.version>
187+
<tsfile.version>2.0.2</tsfile.version>
190188
<xz.version>1.9</xz.version>
191189
<zeppelin.version>0.11.1</zeppelin.version>
192190
<zstd-jni.version>1.5.5-5</zstd-jni.version>

0 commit comments

Comments
 (0)