This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 6562d27e702c738ce040d84ad76b3958a480bd7a Author: Volodymyr Vysotskyi <vvo...@gmail.com> AuthorDate: Thu Feb 9 22:29:32 2023 +0200 DRILL-8398: Fix GitHub Actions to use proper JDK version DRILL-8398: Disable Phoenix tests for JDK 14+ --- .github/workflows/ci.yml | 29 ++++++++++------------ .../drill/exec/TestHivePartitionPruning.java | 2 ++ contrib/storage-phoenix/pom.xml | 13 +++++++++- .../drill/TestTpchDistributedConcurrent.java | 3 ++- .../drill/exec/server/TestDrillbitResilience.java | 6 ++--- pom.xml | 2 +- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f765bb488..265f87985f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,15 +41,13 @@ jobs: fail-fast: false steps: - name: Checkout - uses: actions/checkout@v2 - # Caches maven cache and uses hashes of pom.xml files to find the required cache - - name: Cache Maven Repository - uses: actions/cache@v2 + uses: actions/checkout@v3 + - name: Setup java + uses: actions/setup-java@v3 with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + distribution: 'temurin' + java-version: ${{ matrix.java }} + cache: 'maven' - name: Build and test # The total GitHub Actions memory is 7000Mb. But GitHub CI requires some memory for the container to perform tests run: | @@ -69,17 +67,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 - - name: Cache Maven Repository - uses: actions/cache@v2 + uses: actions/checkout@v3 + - name: Setup java + uses: actions/setup-java@v3 with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + distribution: 'temurin' + java-version: '8' + cache: 'maven' # Caches built protobuf library - name: Cache protobufs - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/protobuf key: ${{ runner.os }}-protobuf diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java index 971349ece1..62a2c136ae 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java @@ -28,6 +28,7 @@ import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -162,6 +163,7 @@ public class TestHivePartitionPruning extends HiveTestBase { } @Test // DRILL-6173 + @Ignore("DRILL-8400") public void prunePartitionsBasedOnTransitivePredicates() throws Exception { String query = String.format("SELECT * FROM hive.partition_pruning_test t1 " + "JOIN hive.partition_with_few_schemas t2 ON t1.`d` = t2.`d` AND t1.`e` = t2.`e` " + diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml index cb3dc23419..d6a79617fd 100644 --- a/contrib/storage-phoenix/pom.xml +++ b/contrib/storage-phoenix/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>drill-storage-phoenix</artifactId> <name>Drill : Contrib : Storage : Phoenix</name> - + <properties> <phoenix.version>5.1.2</phoenix.version> <!-- Keep the 2.4.2 to reduce dependency conflict --> @@ -395,5 +395,16 @@ </plugins> </build> </profile> + <profile> + <!-- Disable unit tests for JDK 14+ until Phoenix 5.2.0+ is released. + See PHOENIX-6723 for details.--> + <id>jdk14+</id> + <activation> + <jdk>[14,)</jdk> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> </profiles> </project> diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java index c144c53bde..74732fec73 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java @@ -24,6 +24,7 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.Semaphore; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.SlowTest; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.ExecConstants; @@ -55,7 +56,7 @@ import static org.junit.Assert.assertNull; * unstable from running a lot of queries concurrently -- it's not about * any particular order of execution. We ignore the results. */ -@Category({SlowTest.class}) +@Category({SlowTest.class, EasyOutOfMemory.class}) public class TestTpchDistributedConcurrent extends ClusterTest { private static final Logger logger = LoggerFactory.getLogger(TestTpchDistributedConcurrent.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java index 3f66fd67a5..a71ea313c2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java @@ -29,6 +29,7 @@ import java.io.IOException; import ch.qos.logback.classic.Level; import org.apache.commons.math3.util.Pair; +import org.apache.drill.categories.EasyOutOfMemory; import org.apache.drill.categories.FlakyTest; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec; @@ -82,12 +83,12 @@ import org.apache.drill.exec.testing.ControlsInjectionUtil; import org.apache.drill.exec.util.Pointer; import org.apache.drill.exec.work.fragment.FragmentExecutor; import org.apache.drill.categories.SlowTest; +import org.junit.experimental.categories.Category; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.Timeout; @@ -105,8 +106,7 @@ import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; * <li>specify Level.DEBUG for CURRENT_LOG_LEVEL</li> * <li>compare trace output for successful test case and failed</li> */ -@Tag(SlowTest.TAG) -@Tag(FlakyTest.TAG) +@Category({ SlowTest.class, FlakyTest.class, EasyOutOfMemory.class }) public class TestDrillbitResilience extends ClusterTest { private static final Logger logger = org.slf4j.LoggerFactory.getLogger(TestDrillbitResilience.class); protected static LogFixture logFixture; diff --git a/pom.xml b/pom.xml index a653d62ac2..235dfab97a 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <codemodel.version>2.6</codemodel.version> <joda.version>2.10.14</joda.version> <javax.el.version>3.0.0</javax.el.version> - <surefire.version>3.0.0-M7</surefire.version> + <surefire.version>3.0.0-M8</surefire.version> <jna.version>5.8.0</jna.version> <commons.compress.version>1.21</commons.compress.version> <hikari.version>4.0.3</hikari.version>