Skip to content

Commit 21679d1

Browse files
ennuiteennuite
committed
Update branch from upstream
2 parents 010bbd2 + 6e73f7f commit 21679d1

File tree

42 files changed

+3971
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3971
-214
lines changed

‎.github/workflows/rc.yml‎

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,12 @@ jobs:
107107
- name: Extract source archive
108108
run: |
109109
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
110-
# We always use the main branch for apache/arrow for now.
111-
# Because we want to use
112-
# https://github.com/apache/arrow/pull/45114 in
113-
# apache/arrow-java. We can revert this workaround once Apache
114-
# Arrow 20.0.0 that includes the change released.
115-
#
116-
# - name: Download the latest Apache Arrow C++
117-
# if: github.event_name != 'schedule'
118-
# run: |
119-
# ci/scripts/download_cpp.sh
110+
- name: Download the latest Apache Arrow C++
111+
if: github.event_name != 'schedule'
112+
run: |
113+
ci/scripts/download_cpp.sh
120114
- name: Checkout Apache Arrow C++
121-
# if: github.event_name == 'schedule'
115+
if: github.event_name == 'schedule'
122116
uses: actions/checkout@v6
123117
with:
124118
repository: apache/arrow
@@ -133,7 +127,7 @@ jobs:
133127
with:
134128
repository: apache/parquet-testing
135129
path: arrow/cpp/submodules/parquet-testing
136-
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
130+
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
137131
with:
138132
registry: ghcr.io
139133
username: ${{ github.actor }}
@@ -180,12 +174,12 @@ jobs:
180174
- name: Extract source archive
181175
run: |
182176
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
183-
# - name: Download the latest Apache Arrow C++
184-
# if: github.event_name != 'schedule'
185-
# run: |
186-
# ci/scripts/download_cpp.sh
177+
- name: Download the latest Apache Arrow C++
178+
if: github.event_name != 'schedule'
179+
run: |
180+
ci/scripts/download_cpp.sh
187181
- name: Checkout Apache Arrow C++
188-
# if: github.event_name == 'schedule'
182+
if: github.event_name == 'schedule'
189183
uses: actions/checkout@v6
190184
with:
191185
repository: apache/arrow
@@ -309,19 +303,13 @@ jobs:
309303
shell: bash
310304
run: |
311305
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
312-
# We always use the main branch for apache/arrow for now.
313-
# Because we want to use
314-
# https://github.com/apache/arrow/pull/47749 in
315-
# apache/arrow-java. We can revert this workaround once Apache
316-
# Arrow 22.0.0 that includes the change released.
317-
#
318-
# - name: Download the latest Apache Arrow C++
319-
# if: github.event_name != 'schedule'
320-
# shell: bash
321-
# run: |
322-
# ci/scripts/download_cpp.sh
306+
- name: Download the latest Apache Arrow C++
307+
if: github.event_name != 'schedule'
308+
shell: bash
309+
run: |
310+
ci/scripts/download_cpp.sh
323311
- name: Checkout Apache Arrow C++
324-
# if: github.event_name == 'schedule'
312+
if: github.event_name == 'schedule'
325313
uses: actions/checkout@v6
326314
with:
327315
repository: apache/arrow

‎.mvn/extensions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<extension>
2424
<groupId>com.gradle</groupId>
2525
<artifactId>develocity-maven-extension</artifactId>
26-
<version>2.3.1</version>
26+
<version>2.3.4</version>
2727
</extension>
2828
<extension>
2929
<groupId>com.gradle</groupId>

‎README.md‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
The following guides explain the fundamental data structures used in the Java implementation of Apache Arrow.
2525

26-
- [ValueVector](https://arrow.apache.org/docs/java/vector.html) is an abstraction that is used to store a sequence of values having the same type in an individual column.
27-
- [VectorSchemaRoot](https://arrow.apache.org/docs/java/vector_schema_root.html) is a container that can hold multiple vectors based on a schema.
28-
- The [Reading/Writing IPC formats](https://arrow.apache.org/docs/java/ipc.html) guide explains how to stream record batches as well as serializing record batches to files.
26+
- [ValueVector](https://arrow.apache.org/java/current/vector.html) is an abstraction that is used to store a sequence of values having the same type in an individual column.
27+
- [VectorSchemaRoot](https://arrow.apache.org/java/current/vector_schema_root.html#vectorschemaroot) is a container that can hold multiple vectors based on a schema.
28+
- The [Reading/Writing IPC formats](https://arrow.apache.org/java/current/ipc.html) guide explains how to stream record batches as well as serializing record batches to files.
2929

30-
Generated javadoc documentation is available [here](https://arrow.apache.org/docs/java/).
30+
Generated javadoc documentation is available [here](https://arrow.apache.org/java/current/).
3131

3232
## Building from source
3333

@@ -50,7 +50,7 @@ a version of your choosing.
5050
$ flatc --version
5151
flatc version 25.1.24
5252

53-
$ grep "dep.fbs.version" java/pom.xml
53+
$ grep "dep.fbs.version" pom.xml
5454
<dep.fbs.version>25.1.24</dep.fbs.version>
5555
```
5656

@@ -60,10 +60,10 @@ $ grep "dep.fbs.version" java/pom.xml
6060
cd $ARROW_HOME
6161

6262
# remove the existing files
63-
rm -rf java/format/src
63+
rm -rf format/src
6464

6565
# regenerate from the .fbs files
66-
flatc --java -o java/format/src/main/java format/*.fbs
66+
flatc --java -o format/src/main/java arrow-format/*.fbs
6767

6868
# prepend license header
6969
mvn spotless:apply -pl :arrow-format
@@ -93,7 +93,7 @@ conflicting or duplicate fields set this JVM flag or use the correct static cons
9393

9494
## Java Code Style Guide
9595

96-
Arrow Java follows the Google style guide [here][3] with the following
96+
Arrow Java follows the [Google Java Style Guide](http://google.github.io/styleguide/javaguide.html) with the following
9797
differences:
9898

9999
* Imports are grouped, from top to bottom, in this order: static imports,
@@ -119,21 +119,16 @@ following command run in the project root directory:
119119
mvn -Dlogback.configurationFile=file:<path-of-logback-file>
120120
```
121121

122-
See [Logback Configuration][1] for more details.
122+
See [Logback Configuration](https://logback.qos.ch/manual/configuration.html) for more details.
123123

124124
## Integration Tests
125125

126126
Integration tests which require more time or more memory can be run by activating
127-
the `integration-tests` profile. This activates the [maven failsafe][4] plugin
127+
the `integration-tests` profile. This activates the [Maven Failsafe](https://maven.apache.org/surefire/maven-failsafe-plugin/) plugin
128128
and any class prefixed with `IT` will be run during the testing phase. The integration
129129
tests currently require a larger amount of memory (>4GB) and time to complete. To activate
130130
the profile:
131131

132132
```bash
133133
mvn -Pintegration-tests <rest of mvn arguments>
134134
```
135-
136-
[1]: https://logback.qos.ch/manual/configuration.html
137-
[2]: https://github.com/apache/arrow/blob/main/cpp/README.md
138-
[3]: http://google.github.io/styleguide/javaguide.html
139-
[4]: https://maven.apache.org/surefire/maven-failsafe-plugin/

‎arrow-variant/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.apache.arrow</groupId>
24+
<artifactId>arrow-java-root</artifactId>
25+
<version>19.0.0-SNAPSHOT</version>
26+
</parent>
27+
<artifactId>arrow-variant</artifactId>
28+
<name>Arrow Variant</name>
29+
<description>Arrow Variant type support.</description>
30+
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.apache.arrow</groupId>
34+
<artifactId>arrow-memory-core</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.arrow</groupId>
38+
<artifactId>arrow-vector</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.parquet</groupId>
42+
<artifactId>parquet-variant</artifactId>
43+
<version>${dep.parquet.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.arrow</groupId>
47+
<artifactId>arrow-memory-unsafe</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
</dependencies>
51+
</project>

‎arrow-variant/src/main/java/module-info.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
@SuppressWarnings("requires-automatic")
19+
module org.apache.arrow.variant {
20+
exports org.apache.arrow.variant;
21+
exports org.apache.arrow.variant.extension;
22+
exports org.apache.arrow.variant.impl;
23+
exports org.apache.arrow.variant.holders;
24+
25+
requires org.apache.arrow.memory.core;
26+
requires org.apache.arrow.vector;
27+
requires parquet.variant;
28+
}

0 commit comments

Comments
 (0)