You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by ha...@apache.org on 2025/12/12 09:51:54 UTC
(tsfile) 01/02: Switch to at.yawk.lz4:lz4-java (#651)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch cp_lz4_upgrade
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 6fb414b59e2a314c2731e7fea139d069e9f826e9
Author: Haonan <hh...@outlook.com>
AuthorDate: Fri Dec 5 10:01:08 2025 +0800
Switch to at.yawk.lz4:lz4-java (#651)
---
java/pom.xml | 14 ++---------
java/tsfile/pom.xml | 27 ++++++++++++++--------
.../org/apache/tsfile/compress/IUnCompressor.java | 3 +--
3 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/java/pom.xml b/java/pom.xml
index 03571d61..fbb2493c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -48,19 +48,9 @@
<version>1.1.10.5</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.16.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.18.0</version>
- </dependency>
- <dependency>
- <groupId>org.lz4</groupId>
+ <groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
- <version>1.8.0</version>
+ <version>1.10.0</version>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index 73d41730..f2f7e509 100644
--- a/java/tsfile/pom.xml
+++ b/java/tsfile/pom.xml
@@ -49,15 +49,7 @@
<artifactId>snappy-java</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.lz4</groupId>
+ <groupId>at.yawk.lz4</groupId>
<artifactId>lz4-java</artifactId>
</dependency>
<dependency>
@@ -165,6 +157,23 @@
<phase>process-classes</phase>
</execution>
</executions>
+<<<<<<< HEAD
+=======
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <instructions>
+ <Export-Package>org.apache.tsfile.*</Export-Package>
+ <Embed-Dependency>common;inline=true</Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
+ <Private-Package/>
+ <_removeheaders>Bnd-LastModified,Built-By</_removeheaders>
+ <Bundle-SymbolicName>org.apache.tsfile</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+>>>>>>> 25b630e6 (Switch to at.yawk.lz4:lz4-java (#651))
</plugin>
<!--
Use the MANIFEST file generated by the maven-bundle-plugin.
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java b/java/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java
index ddb402c7..0e4b292e 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/compress/IUnCompressor.java
@@ -23,7 +23,6 @@ import org.apache.tsfile.exception.compress.CompressionTypeNotSupportedException
import org.apache.tsfile.file.metadata.enums.CompressionType;
import com.github.luben.zstd.Zstd;
-import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4SafeDecompressor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -195,7 +194,7 @@ public interface IUnCompressor {
class LZ4UnCompressor implements IUnCompressor {
- private static final Logger logger = LoggerFactory.getLogger(LZ4Compressor.class);
+ private static final Logger logger = LoggerFactory.getLogger(LZ4UnCompressor.class);
private static final String UNCOMPRESS_INPUT_ERROR =
"tsfile-compression LZ4UnCompressor: errors occurs when uncompress input byte";