Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions .github/workflows/ci-hadoop2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# 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.

name: CI Hadoop 2

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
codes: [ 'uncompressed,brotli', 'gzip,snappy' ]
name: Build Parquet with JDK ${{ matrix.java }} and ${{ matrix.codes }}

steps:
- uses: actions/checkout@master
- name: Set up JDK8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: before_install
env:
CI_TARGET_BRANCH: $GITHUB_HEAD_REF
run: |
bash dev/ci-before_install.sh
- name: install
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn 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
- name: verify
env:
TEST_CODECS: ${{ matrix.codes }}
JAVA_VERSION: ${{ matrix.java }}
run: |
EXTRA_JAVA_TEST_ARGS=$(mvn help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
mvn verify --batch-mode -P hadoop2 javadoc:javadoc -Pci-test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Test
name: CI Hadoop 3

on: [push, pull_request]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.parquet.thrift.projection.deprecated;

import org.apache.hadoop.fs.GlobPattern;

import com.google.re2j.Pattern;
import com.google.re2j.PatternSyntaxException;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This caused issues:

[ERROR] /Users/fokkodriesprong/Desktop/parquet-mr/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java:[55,49] incompatible types: java.util.regex.Pattern cannot be converted to com.google.re2j.Pattern

Different libraries are used in Hadoop 2 and 3. I think it makes sense to remove this class since it is already marked deprecated for a very long time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the static function since it isn't being used in the project.


Expand All @@ -45,16 +43,6 @@ public PathGlobPattern(String globPattern) {
set(globPattern);
}

/**
* Compile glob pattern string
*
* @param globPattern the glob pattern
* @return the pattern object
*/
public static Pattern compile(String globPattern) {
return new GlobPattern(globPattern).compiled();
}

private static void error(String message, String pattern, int pos) {
throw new PatternSyntaxException(String.format("%1s at %2d", message, pos), pattern);
}
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,6 @@
</repository>
</repositories>

<developers>
<developer>
<name>Julien Le Dem</name>
<email>julien@twitter.com</email>
</developer>
</developers>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down Expand Up @@ -601,6 +594,13 @@
</build>

<profiles>
<profile>
<id>hadoop2</id>
<properties>
<hadoop.version>2.9.2</hadoop.version>
</properties>
</profile>

<profile>
<id>update-github-site</id>
<reporting>
Expand Down