diff --git a/.github/workflows/ci-hadoop2.yml b/.github/workflows/ci-hadoop2.yml new file mode 100644 index 0000000000..b824e18456 --- /dev/null +++ b/.github/workflows/ci-hadoop2.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/ci-hadoop3.yml similarity index 99% rename from .github/workflows/test.yml rename to .github/workflows/ci-hadoop3.yml index 56f172f713..2878d8d644 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/ci-hadoop3.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -name: Test +name: CI Hadoop 3 on: [push, pull_request] diff --git a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java index 4d4136f11d..df5323306d 100644 --- a/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java +++ b/parquet-thrift/src/main/java/org/apache/parquet/thrift/projection/deprecated/PathGlobPattern.java @@ -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; @@ -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); } diff --git a/pom.xml b/pom.xml index 9f55a06881..b3c2af1945 100644 --- a/pom.xml +++ b/pom.xml @@ -59,13 +59,6 @@ - - - Julien Le Dem - julien@twitter.com - - - 1.8 1.8 @@ -601,6 +594,13 @@ + + hadoop2 + + 2.9.2 + + + update-github-site