Skip to content

Commit 9895d0c

Browse files
committed
Upgrade 1.1.1 + Jindo
1 parent 0be8175 commit 9895d0c

File tree

3 files changed

+64
-6
lines changed

3 files changed

+64
-6
lines changed

paimon-python-java-bridge/pom.xml

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,32 @@
2323

2424
<groupId>org.apache.paimon</groupId>
2525
<artifactId>paimon-python-java-bridge</artifactId>
26-
<version>0.9-SNAPSHOT</version>
26+
<version>1.1.1</version>
2727
<name>Paimon : Python-Java Bridge</name>
2828

2929
<packaging>jar</packaging>
3030
<inceptionYear>2024</inceptionYear>
3131

3232
<properties>
33-
<paimon.version>0.9.0</paimon.version>
33+
<paimon.version>1.1.1</paimon.version>
3434
<py4j.version>0.10.9.7</py4j.version>
3535
<slf4j.version>1.7.32</slf4j.version>
3636
<log4j.version>2.17.1</log4j.version>
3737
<spotless.version>2.13.0</spotless.version>
3838
<spotless.delimiter>package</spotless.delimiter>
3939
<arrow.version>14.0.0</arrow.version>
4040
<target.java.version>1.8</target.java.version>
41-
<paimon.ci.tools.version>0.9.0</paimon.ci.tools.version>
41+
<paimon.ci.tools.version>1.1.1</paimon.ci.tools.version>
42+
<jindodata.version>6.5.6</jindodata.version>
4243
</properties>
4344

45+
<repositories>
46+
<repository>
47+
<id>jindodata</id>
48+
<url>https://jindodata-binary.oss-cn-shanghai.aliyuncs.com/mvn-repo/</url>
49+
</repository>
50+
</repositories>
51+
4452
<dependencies>
4553

4654
<!-- Java dependencies -->
@@ -95,6 +103,49 @@
95103
<version>${py4j.version}</version>
96104
</dependency>
97105

106+
<!-- Jindo dependencies -->
107+
108+
<dependency>
109+
<groupId>org.apache.paimon</groupId>
110+
<artifactId>paimon-jindo</artifactId>
111+
<version>${paimon.version}</version>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>com.aliyun.jindodata</groupId>
116+
<artifactId>jindo-sdk</artifactId>
117+
<version>${jindodata.version}</version>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>com.aliyun.jindodata</groupId>
122+
<artifactId>jindo-core</artifactId>
123+
<version>${jindodata.version}</version>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>com.aliyun.jindodata</groupId>
128+
<artifactId>jindo-core-linux-ubuntu22-x86_64</artifactId>
129+
<version>${jindodata.version}</version>
130+
</dependency>
131+
132+
<dependency>
133+
<groupId>com.aliyun.jindodata</groupId>
134+
<artifactId>jindo-core-macos-11_0-x86_64</artifactId>
135+
<version>${jindodata.version}</version>
136+
</dependency>
137+
138+
<dependency>
139+
<groupId>com.aliyun.jindodata</groupId>
140+
<artifactId>jindo-core-macos-11_0-aarch64</artifactId>
141+
<version>${jindodata.version}</version>
142+
</dependency>
143+
144+
<dependency>
145+
<groupId>com.aliyun.jindodata</groupId>
146+
<artifactId>jindo-core-linux-el7-aarch64</artifactId>
147+
<version>${jindodata.version}</version>
148+
</dependency>
98149
</dependencies>
99150

100151
<build>
@@ -177,6 +228,13 @@
177228
<include>org.slf4j:slf4j-api</include>
178229
<include>org.apache.logging.log4j:log4j-1.2-api</include>
179230
<include>net.sf.py4j:py4j</include>
231+
<include>org.apache.paimon:paimon-jindo</include>
232+
<include>com.aliyun.jindodata:jindo-sdk</include>
233+
<include>com.aliyun.jindodata:jindo-core</include>
234+
<include>com.aliyun.jindodata:jindo-core-linux-ubuntu22-x86_64</include>
235+
<include>com.aliyun.jindodata:jindo-core-macos-11_0-x86_64</include>
236+
<include>com.aliyun.jindodata:jindo-core-macos-11_0-aarch64</include>
237+
<include>com.aliyun.jindodata:jindo-core-linux-el7-aarch64</include>
180238
</includes>
181239
</artifactSet>
182240
<transformers combine.children="append">

paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public class BytesWriter {
4444

4545
public BytesWriter(TableWrite tableWrite, RowType rowType) {
4646
this.tableWrite = tableWrite;
47-
this.arrowBatchReader = new ArrowBatchReader(rowType);
47+
this.arrowBatchReader = new ArrowBatchReader(rowType, true);
4848
this.allocator = new RootAllocator();
4949
arrowFields =
5050
rowType.getFields().stream()
51-
.map(f -> ArrowUtils.toArrowField(f.name(), f.type()))
51+
.map(f -> ArrowUtils.toArrowField(f.name(), f.id(), f.type(), 0))
5252
.collect(Collectors.toList());
5353
}
5454

pypaimon/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
"""
2020
.. seealso:: https://www.python.org/dev/peps/pep-0440
2121
"""
22-
__version__ = "0.3.dev0"
22+
__version__ = "0.3.dev2"

0 commit comments

Comments
 (0)