This is an automated email from the ASF dual-hosted git repository. yuzelin pushed a commit to branch temporary-1.1.1 in repository https://gitbox.apache.org/repos/asf/paimon-python.git
commit 51698c799c5ac206b8c0955911581d641e68f1ae Author: yuzelin <[email protected]> AuthorDate: Wed May 7 11:01:57 2025 +0800 Upgrade 1.1.1 + Jindo --- paimon-python-java-bridge/pom.xml | 64 +++++++++++++++++++++- .../java/org/apache/paimon/python/BytesWriter.java | 4 +- pypaimon/version.py | 2 +- 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/paimon-python-java-bridge/pom.xml b/paimon-python-java-bridge/pom.xml index dd7f7f2..68f3557 100644 --- a/paimon-python-java-bridge/pom.xml +++ b/paimon-python-java-bridge/pom.xml @@ -23,14 +23,14 @@ <groupId>org.apache.paimon</groupId> <artifactId>paimon-python-java-bridge</artifactId> - <version>0.9-SNAPSHOT</version> + <version>1.1.1</version> <name>Paimon : Python-Java Bridge</name> <packaging>jar</packaging> <inceptionYear>2024</inceptionYear> <properties> - <paimon.version>0.9.0</paimon.version> + <paimon.version>1.1.1</paimon.version> <py4j.version>0.10.9.7</py4j.version> <slf4j.version>1.7.32</slf4j.version> <log4j.version>2.17.1</log4j.version> @@ -38,9 +38,17 @@ <spotless.delimiter>package</spotless.delimiter> <arrow.version>14.0.0</arrow.version> <target.java.version>1.8</target.java.version> - <paimon.ci.tools.version>0.9.0</paimon.ci.tools.version> + <paimon.ci.tools.version>1.1.1</paimon.ci.tools.version> + <jindodata.version>6.5.6</jindodata.version> </properties> + <repositories> + <repository> + <id>jindodata</id> + <url>https://jindodata-binary.oss-cn-shanghai.aliyuncs.com/mvn-repo/</url> + </repository> + </repositories> + <dependencies> <!-- Java dependencies --> @@ -95,6 +103,49 @@ <version>${py4j.version}</version> </dependency> + <!-- Jindo dependencies --> + + <dependency> + <groupId>org.apache.paimon</groupId> + <artifactId>paimon-ali-jindo</artifactId> + <version>${paimon.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-sdk</artifactId> + <version>${jindodata.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-core</artifactId> + <version>${jindodata.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-core-linux-ubuntu22-x86_64</artifactId> + <version>${jindodata.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-core-macos-11_0-x86_64</artifactId> + <version>${jindodata.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-core-macos-11_0-aarch64</artifactId> + <version>${jindodata.version}</version> + </dependency> + + <dependency> + <groupId>com.aliyun.jindodata</groupId> + <artifactId>jindo-core-linux-el7-aarch64</artifactId> + <version>${jindodata.version}</version> + </dependency> </dependencies> <build> @@ -177,6 +228,13 @@ <include>org.slf4j:slf4j-api</include> <include>org.apache.logging.log4j:log4j-1.2-api</include> <include>net.sf.py4j:py4j</include> + <include>org.apache.paimon:paimon-ali-jindo</include> + <include>com.aliyun.jindodata:jindo-sdk</include> + <include>com.aliyun.jindodata:jindo-core</include> + <include>com.aliyun.jindodata:jindo-core-linux-ubuntu22-x86_64</include> + <include>com.aliyun.jindodata:jindo-core-macos-11_0-x86_64</include> + <include>com.aliyun.jindodata:jindo-core-macos-11_0-aarch64</include> + <include>com.aliyun.jindodata:jindo-core-linux-el7-aarch64</include> </includes> </artifactSet> <transformers combine.children="append"> diff --git a/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java b/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java index f2ca4e1..fe53597 100644 --- a/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java +++ b/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java @@ -44,11 +44,11 @@ public class BytesWriter { public BytesWriter(TableWrite tableWrite, RowType rowType) { this.tableWrite = tableWrite; - this.arrowBatchReader = new ArrowBatchReader(rowType); + this.arrowBatchReader = new ArrowBatchReader(rowType, true); this.allocator = new RootAllocator(); arrowFields = rowType.getFields().stream() - .map(f -> ArrowUtils.toArrowField(f.name(), f.type())) + .map(f -> ArrowUtils.toArrowField(f.name(), f.id(), f.type(), 0)) .collect(Collectors.toList()); } diff --git a/pypaimon/version.py b/pypaimon/version.py index 468375f..2cd5c40 100644 --- a/pypaimon/version.py +++ b/pypaimon/version.py @@ -19,4 +19,4 @@ """ .. seealso:: https://www.python.org/dev/peps/pep-0440 """ -__version__ = "0.3.dev0" +__version__ = "0.3.dev2"
