You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2020/11/06 16:51:40 UTC

[calcite] branch master updated: Add OpenJ9 1.8 CI job at GitHub Actions

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new d226a94  Add OpenJ9 1.8 CI job at GitHub Actions
d226a94 is described below

commit d226a9456a8cfdb108a50744d702e915b46c7ffa
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Nov 6 01:44:38 2020 +0300

    Add OpenJ9 1.8 CI job at GitHub Actions
---
 .github/workflows/main.yml                         | 28 ++++++++++++++++++++++
 .../apache/calcite/util/ImmutableBitSetTest.java   |  5 ++--
 .../calcite/adapter/os/JpsTableFunction.java       |  4 +++-
 .../apache/calcite/adapter/os/OsAdapterTest.java   |  1 +
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 70c3e25..f159646 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -102,6 +102,34 @@ jobs:
           calcite.avatica.version=1.0.0-dev-master-SNAPSHOT
           enableMavenLocal=
 
+  linux-openj9:
+    if: github.event.action != 'labeled'
+    name: 'Linux (OpenJ9 8)'
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+      - uses: AdoptOpenJDK/install-jdk@v1
+        with:
+          impl: openj9
+          version: '8'
+          architecture: x64
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
+        with:
+          job-id: jdk8-openj9
+          arguments: --scan --no-parallel --no-daemon build javadoc
+      - name: 'sqlline and sqllsh'
+        run: |
+          ./sqlline -e '!quit'
+          echo
+          echo Sqlline example/csv
+          ./example/csv/sqlline --verbose -u jdbc:calcite:model=example/csv/src/test/resources/model.json -n admin -p admin -f example/csv/src/test/resources/smoke_test.sql
+          echo
+          echo sqlsh
+          ./sqlsh -o headers "select count(*) commits, author from (select substring(author, 1, position(' <' in author)-1) author from git_commits) group by author order by count(*) desc, author limit 20"
+
   mac:
     if: github.event.action != 'labeled'
     name: 'macOS (JDK 15)'
diff --git a/core/src/test/java/org/apache/calcite/util/ImmutableBitSetTest.java b/core/src/test/java/org/apache/calcite/util/ImmutableBitSetTest.java
index a7f44e7..e963240 100644
--- a/core/src/test/java/org/apache/calcite/util/ImmutableBitSetTest.java
+++ b/core/src/test/java/org/apache/calcite/util/ImmutableBitSetTest.java
@@ -36,7 +36,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.sameInstance;
@@ -546,8 +545,8 @@ class ImmutableBitSetTest {
     try {
       final ImmutableBitSet x = bitSet.shift(-5);
       fail("Expected error, got " + x);
-    } catch (ArrayIndexOutOfBoundsException e) {
-      assertThat(e.getMessage(), anyOf(is("-1"), is("Index -1 out of bounds for length 0")));
+    } catch (ArrayIndexOutOfBoundsException ignored) {
+      // Exact message is not specified by Java
     }
     final ImmutableBitSet empty = ImmutableBitSet.of();
     assertThat(empty.shift(-100), is(empty));
diff --git a/plus/src/main/java/org/apache/calcite/adapter/os/JpsTableFunction.java b/plus/src/main/java/org/apache/calcite/adapter/os/JpsTableFunction.java
index fda75aa..fbca3af 100644
--- a/plus/src/main/java/org/apache/calcite/adapter/os/JpsTableFunction.java
+++ b/plus/src/main/java/org/apache/calcite/adapter/os/JpsTableFunction.java
@@ -43,7 +43,9 @@ public class JpsTableFunction {
   public static ScannableTable eval(boolean b) {
     return new ScannableTable() {
       @Override public Enumerable<Object[]> scan(DataContext root) {
-        return Processes.processLines("jps", "-mlvV")
+        // https://github.com/eclipse/openj9/issues/11036
+        // openj9 jps doesn't handle multiple flags in one argument
+        return Processes.processLines("jps", "-m", "-l", "-v")
             .select(a0 -> {
               final String[] fields = a0.split(" ");
               return new Object[]{Long.valueOf(fields[0]), fields[1]};
diff --git a/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java b/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
index 99e7458..0a4e9fe 100644
--- a/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
+++ b/plus/src/test/java/org/apache/calcite/adapter/os/OsAdapterTest.java
@@ -207,6 +207,7 @@ class OsAdapterTest {
   }
 
   @Test void testJps() {
+    assumeToolExists("jps");
     final String q = "select pid, info from jps";
     sql(q).returns(r -> {
       try {