This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new f0c43a88f [core] Move the hilbert dependencies to paimon-common module
(#3251)
f0c43a88f is described below
commit f0c43a88f74bf1b6a29e35ef2cf10b94a8d9a17a
Author: Wencong Liu <[email protected]>
AuthorDate: Thu Apr 25 16:59:54 2024 +0800
[core] Move the hilbert dependencies to paimon-common module (#3251)
---
paimon-common/pom.xml | 16 ++++++++++++++++
.../org/apache/paimon/sort/hilbert/HilbertIndexer.java | 0
.../java/org/apache/paimon/utils/ConvertBinaryUtil.java | 0
paimon-common/src/main/resources/META-INF/NOTICE | 2 ++
paimon-core/pom.xml | 6 ------
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/paimon-common/pom.xml b/paimon-common/pom.xml
index 38f89999f..ce28a2053 100644
--- a/paimon-common/pom.xml
+++ b/paimon-common/pom.xml
@@ -147,6 +147,12 @@ under the License.
<version>0.16</version>
</dependency>
+ <dependency>
+ <groupId>com.github.davidmoten</groupId>
+ <artifactId>hilbert-curve</artifactId>
+ <version>0.2.2</version>
+ </dependency>
+
<!-- Test -->
<dependency>
@@ -280,6 +286,8 @@ under the License.
<include>it.unimi.dsi:fastutil</include>
<include>org.roaringbitmap:RoaringBitmap</include>
<include>net.openhft:zero-allocation-hashing</include>
+
<include>com.github.davidmoten:hilbert-curve</include>
+
<include>com.github.davidmoten:guava-mini</include>
</includes>
</artifactSet>
<filters>
@@ -323,6 +331,14 @@ under the License.
<pattern>net.openhft.hashing</pattern>
<shadedPattern>org.apache.paimon.shade.net.openhft.hashing</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.davidmoten.hilbert</pattern>
+
<shadedPattern>org.apache.paimon.shade.org.davidmoten.hilbert</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>com.github.davidmoten.guavamini</pattern>
+
<shadedPattern>org.apache.paimon.shade.com.github.davidmoten.guavamini</shadedPattern>
+ </relocation>
</relocations>
<minimizeJar>true</minimizeJar>
</configuration>
diff --git
a/paimon-core/src/main/java/org/apache/paimon/sort/hilbert/HilbertIndexer.java
b/paimon-common/src/main/java/org/apache/paimon/sort/hilbert/HilbertIndexer.java
similarity index 100%
rename from
paimon-core/src/main/java/org/apache/paimon/sort/hilbert/HilbertIndexer.java
rename to
paimon-common/src/main/java/org/apache/paimon/sort/hilbert/HilbertIndexer.java
diff --git
a/paimon-core/src/main/java/org/apache/paimon/utils/ConvertBinaryUtil.java
b/paimon-common/src/main/java/org/apache/paimon/utils/ConvertBinaryUtil.java
similarity index 100%
rename from
paimon-core/src/main/java/org/apache/paimon/utils/ConvertBinaryUtil.java
rename to
paimon-common/src/main/java/org/apache/paimon/utils/ConvertBinaryUtil.java
diff --git a/paimon-common/src/main/resources/META-INF/NOTICE
b/paimon-common/src/main/resources/META-INF/NOTICE
index cd1ab89b8..c58d808b7 100644
--- a/paimon-common/src/main/resources/META-INF/NOTICE
+++ b/paimon-common/src/main/resources/META-INF/NOTICE
@@ -15,3 +15,5 @@ You find them under licenses/LICENSE.antlr-runtime and
licenses/LICENSE.janino.
- org.codehaus.janino:commons-compiler:3.0.11
- it.unimi.dsi:fastutil:8.5.12
- net.openhft:zero-allocation-hashing:0.16
+- com.github.davidmoten:hilbert-curve:0.2.2
+- com.github.davidmoten:guava-mini:0.1.3
diff --git a/paimon-core/pom.xml b/paimon-core/pom.xml
index 5e7339e61..f4e028bdc 100644
--- a/paimon-core/pom.xml
+++ b/paimon-core/pom.xml
@@ -183,12 +183,6 @@ under the License.
<version>3.6.1</version>
</dependency>
- <dependency>
- <groupId>com.github.davidmoten</groupId>
- <artifactId>hilbert-curve</artifactId>
- <version>0.2.2</version>
- </dependency>
-
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
