Skip to content

Commit

Permalink
Merge branch 'master' into fd-dont-run-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wgtmac authored Sep 30, 2024
2 parents a8a8088 + 0c8b757 commit dc1fbf3
Show file tree
Hide file tree
Showing 34 changed files with 1,800 additions and 404 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-hadoop2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ jobs:
bash dev/ci-before_install.sh
- name: install
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn install --batch-mode -P hadoop2 -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=1.8
./mvnw install --batch-mode -P hadoop2 -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=1.8
- name: verify
env:
TEST_CODECS: ${{ matrix.codes }}
JAVA_VERSION: ${{ matrix.java }}
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn verify --batch-mode -P hadoop2 javadoc:javadoc
./mvnw verify --batch-mode -P hadoop2 javadoc:javadoc
8 changes: 4 additions & 4 deletions .github/workflows/ci-hadoop3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ jobs:
bash dev/ci-before_install.sh
- name: install
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=${{ matrix.java.maven }}
./mvnw install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=${{ matrix.java.maven }}
- name: verify
env:
TEST_CODECS: ${{ matrix.codes }}
JAVA_VERSION: ${{ matrix.java.setup }}
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn verify --batch-mode javadoc:javadoc
./mvnw verify --batch-mode javadoc:javadoc
8 changes: 4 additions & 4 deletions .github/workflows/vector-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ jobs:
bash dev/ci-before_install.sh
- name: install
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn install --batch-mode -Pvector-plugins -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=${{ matrix.java }} -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
./mvnw install --batch-mode -Pvector-plugins -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=${{ matrix.java }} -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
- name: verify
env:
TEST_CODECS: ${{ matrix.codes }}
JAVA_VERSION: ${{ matrix.java }}
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn verify --batch-mode -Pvector-plugins javadoc:javadoc -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
./mvnw verify --batch-mode -Pvector-plugins javadoc:javadoc -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
19 changes: 19 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Parquet-Java uses Maven to build and depends on the thrift compiler (protoc is n
To build and install the thrift compiler, run:

```
wget -nv http://archive.apache.org/dist/thrift/0.20.0/thrift-0.20.0.tar.gz
wget -nv https://archive.apache.org/dist/thrift/0.20.0/thrift-0.20.0.tar.gz
tar xzf thrift-0.20.0.tar.gz
cd thrift-0.20.0
chmod +x ./configure
Expand All @@ -63,7 +63,7 @@ export PATH="/usr/local/opt/[email protected]/bin:$PATH"
Once protobuf and thrift are available in your path, you can build the project by running:

```
LC_ALL=C mvn clean install
LC_ALL=C ./mvnw clean install
```

## Features
Expand Down Expand Up @@ -100,7 +100,7 @@ Parquet-Java has supported Java Vector API to speed up reading, to enable this f
* Requiring the CPU to support instruction sets:
* avx512vbmi
* avx512_vbmi2
* To build the jars: `mvn clean package -P vector-plugins`
* To build the jars: `./mvnw clean package -P vector-plugins`
* For Apache Spark to enable this feature:
* Build parquet and replace the parquet-encoding-{VERSION}.jar on the spark jars folder
* Build parquet-encoding-vector and copy parquet-encoding-vector-{VERSION}.jar to the spark jars folder
Expand Down Expand Up @@ -157,9 +157,9 @@ Hive integration is now deprecated within the Parquet project. It is now maintai

## Build

To run the unit tests: `mvn test`
To run the unit tests: `./mvnw test`

To build the jars: `mvn package`
To build the jars: `./mvnw package`

The build runs in [GitHub Actions](https://github.com/apache/parquet-java/actions):
[![Build Status](https://github.com/apache/parquet-java/workflows/Test/badge.svg)](https://github.com/apache/parquet-java/actions)
Expand Down Expand Up @@ -207,7 +207,7 @@ To contribute a patch:
1. Break your work into small, single-purpose patches if possible. It’s much harder to merge in a large change with a lot of disjoint features.
2. Create a JIRA for your patch on the [Parquet Project JIRA](https://issues.apache.org/jira/browse/PARQUET).
3. Submit the patch as a GitHub pull request against the master branch. For a tutorial, see the GitHub guides on forking a repo and sending a pull request. Prefix your pull request name with the JIRA name (ex: https://github.com/apache/parquet-java/pull/240).
4. Make sure that your code passes the unit tests. You can run the tests with `mvn test` in the root directory.
4. Make sure that your code passes the unit tests. You can run the tests with `./mvnw test` in the root directory.
5. Add new unit tests for your code.

We tend to do fairly close readings of pull requests, and you may get a lot of comments. Some common issues that are not code structure related, but still important:
Expand Down
8 changes: 4 additions & 4 deletions dev/finalize-release
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand All @@ -34,8 +34,8 @@ rc_tag="$release_tag-rc$2"
new_development_version="$3-SNAPSHOT"

git tag -am "Release Apache Parquet $release_version" "$release_tag" "$rc_tag"
mvn --batch-mode release:update-versions -DdevelopmentVersion="$new_development_version"
mvn -pl . versions:set-property -Dproperty=previous.version -DnewVersion="$release_version"
./mvnw --batch-mode release:update-versions -DdevelopmentVersion="$new_development_version"
./mvnw -pl . versions:set-property -Dproperty=previous.version -DnewVersion="$release_version"
git commit -am 'Prepare for next development iteration'

echo
Expand Down
10 changes: 5 additions & 5 deletions dev/prepare-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down Expand Up @@ -38,7 +38,7 @@ new_development_version="$release_version-SNAPSHOT"

tag="apache-parquet-$release_version-rc$2"

mvn release:clean
mvn release:prepare -DskipTests -Darguments=-DskipTests -Dtag="$tag" "-DreleaseVersion=$release_version" -DdevelopmentVersion="$new_development_version"
./mvnw release:clean
./mvnw release:prepare -DskipTests -Darguments=-DskipTests -Dtag="$tag" "-DreleaseVersion=$release_version" -DdevelopmentVersion="$new_development_version"

echo "Finish staging binary artifacts by running: mvn release:perform"
echo "Finish staging binary artifacts by running: ./mvnw release:perform"
Loading

0 comments on commit dc1fbf3

Please sign in to comment.