From 6fb414b59e2a314c2731e7fea139d069e9f826e9 Mon Sep 17 00:00:00 2001
From: Haonan <hhaonan@outlook.com>
Date: Fri, 5 Dec 2025 10:01:08 +0800
Subject: [PATCH 1/3] Switch to at.yawk.lz4:lz4-java (#651)

---
 java/pom.xml                                  | 14 ++--------
 java/tsfile/pom.xml                           | 27 ++++++++++++-------
 .../apache/tsfile/compress/IUnCompressor.java |  3 +--
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 03571d61e..fbb2493cf 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 73d41730e..f2f7e5091 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 ddb402c73..0e4b292e5 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.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 CompressionType getCodecName() {
 
   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";
 

From 65ce50b6116711ba1d6072dccb87c618de6e6ed3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Dec 2025 13:13:28 +0800
Subject: [PATCH 2/3] Bump at.yawk.lz4:lz4-java from 1.10.0 to 1.10.1 in /java
 (#656)

Bumps [at.yawk.lz4:lz4-java](https://github.com/yawkat/lz4-java) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/yawkat/lz4-java/releases)
- [Changelog](https://github.com/yawkat/lz4-java/blob/main/CHANGES.md)
- [Commits](https://github.com/yawkat/lz4-java/compare/v1.10.0...v1.10.1)

---
updated-dependencies:
- dependency-name: at.yawk.lz4:lz4-java
  dependency-version: 1.10.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index fbb2493cf..4bc2f8f2e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>at.yawk.lz4</groupId>
                 <artifactId>lz4-java</artifactId>
-                <version>1.10.0</version>
+                <version>1.10.1</version>
             </dependency>
             <dependency>
                 <groupId>org.tukaani</groupId>

From e2cc032693016ffbd85a5fb6aa73c367ab5f3b81 Mon Sep 17 00:00:00 2001
From: HTHou <haonan@apache.org>
Date: Fri, 12 Dec 2025 17:54:46 +0800
Subject: [PATCH 3/3] fix compile

---
 java/pom.xml        | 10 ++++++++++
 java/tsfile/pom.xml | 25 ++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 4bc2f8f2e..36cdd32c5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -47,6 +47,16 @@
                 <artifactId>snappy-java</artifactId>
                 <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>at.yawk.lz4</groupId>
                 <artifactId>lz4-java</artifactId>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index f2f7e5091..49e17924f 100644
--- a/java/tsfile/pom.xml
+++ b/java/tsfile/pom.xml
@@ -48,6 +48,14 @@
             <groupId>org.xerial.snappy</groupId>
             <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>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
@@ -157,23 +165,6 @@
                         <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.