simplify presto-driver workflow

apache · Sep 9, 2021 · edc0dff · edc0dff
1 parent 57ad16b
commit edc0dff
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 251 deletions.
diff --git a/.github/workflows/pinot_tests.yml b/.github/workflows/pinot_tests.yml
@@ -151,57 +151,21 @@ jobs:
     name: Build Presto Pinot Driver
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Set up Toolchain
-        shell: bash
+      - name: Build presto pinot driver with JDK 11
+        env:
+          MAVEN_OPTS: -Xmx2G -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
         run: |
-            mkdir -p $HOME/.m2 \
-            && cat << EOF > $HOME/.m2/toolchains.xml
-            <?xml version="1.0" encoding="UTF8"?>
-            <toolchains>
-              <toolchain>
-                <type>jdk</type>
-                  <provides>
-                    <id>Java11</id>
-                    <version>11</version>
-                  </provides>
-                  <configuration>
-                    <jdkHome>/opt/hostedtoolcache/jdk/11.0.12/x64</jdkHome>
-                  </configuration>
-              </toolchain>
-              <toolchain>
-                <type>jdk</type>
-                  <provides>
-                    <id>Java8</id>
-                    <version>8</version>
-                  </provides>
-                  <configuration>
-                    <jdkHome>/opt/hostedtoolcache/jdk/8.0.302/x64</jdkHome>
-                  </configuration>
-              </toolchain>
-              <toolchain>
-                <type>jdk</type>
-                  <provides>
-                    <id>Java1.8</id>
-                    <version>1.8</version>
-                  </provides>
-                  <configuration>
-                    <jdkHome>/opt/hostedtoolcache/jdk/8.0.302/x64</jdkHome>
-                  </configuration>
-              </toolchain>
-            </toolchains>
-            EOF
-      - name: Build just presto pinot driver
+          mvn clean install -DskipTests -Ppresto-driver -am -B -pl ':presto-pinot-driver' -T 16 || exit 1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Build presto pinot driver with JDK 8
         env:
-          RUN_INTEGRATION_TESTS: false
           MAVEN_OPTS: -Xmx2G -DfailIfNoTests=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
         run: |
-          .github/workflows/scripts/.presto_pinot_build.sh && \
-          ls -lrth pinot-connectors/presto-pinot-driver/target
+          mvn clean install -DskipTests -Ppresto-driver -am -B -pl ':presto-pinot-driver' -Djdk.version=8 -T 16 || exit 1
diff --git a/.github/workflows/scripts/.presto_pinot_build.sh b/.github/workflows/scripts/.presto_pinot_build.sh
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
@@ -33,10 +33,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
   <build>
     <!-- Antlr stuff -->
     <plugins>
@@ -339,6 +337,12 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
     <profile>
       <id>profile-buildthrift</id>
       <activation>

diff --git a/pinot-connectors/presto-pinot-driver/pom.xml b/pinot-connectors/presto-pinot-driver/pom.xml
@@ -598,58 +598,15 @@
             </build>
         </profile>
         <profile>
-            <id>presto-pinot-driver</id>
+            <id>presto-driver</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
+            <properties>
+                <jdk.version>8</jdk.version>
+            </properties>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-toolchains-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <configuration>
-                            <toolchains>
-                                <!-- this project needs a JDK toolchain, version 8 -->
-                                <jdk>
-                                    <version>8</version>
-                                </jdk>
-                            </toolchains>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>toolchain</goal>
-                                </goals>
-                                <!-- the toolchain goal binds to the validate phase automatically -->
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.0</version>
-                        <configuration>
-                            <failOnWarning>false</failOnWarning>
-                            <verbose>true</verbose>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-compile</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>compile</goal>
-                                </goals>
-                                <configuration>
-                                    <source>1.8</source>
-                                    <target>1.8</target>
-                                    <fork>true</fork>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-shade-plugin</artifactId>
@@ -744,14 +701,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-enforcer-plugin</artifactId>
                         <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>default</id>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>

diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
@@ -33,10 +33,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -292,5 +290,11 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro-base/pom.xml
@@ -35,10 +35,8 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.avro</groupId>
@@ -89,5 +87,11 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/pinot-plugins/pinot-input-format/pinot-avro/pom.xml b/pinot-plugins/pinot-input-format/pinot-avro/pom.xml
@@ -35,10 +35,17 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.pinot</groupId>

diff --git a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
@@ -35,10 +35,17 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/pinot-plugins/pinot-input-format/pinot-json/pom.xml b/pinot-plugins/pinot-input-format/pinot-json/pom.xml
@@ -35,10 +35,17 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>commons-lang</groupId>

diff --git a/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml b/pinot-plugins/pinot-metrics/pinot-yammer/pom.xml
@@ -35,11 +35,17 @@
   <properties>
     <pinot.root>${basedir}/../../..</pinot.root>
     <phase.prop>package</phase.prop>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

diff --git a/pinot-segment-local/pom.xml b/pinot-segment-local/pom.xml
@@ -34,11 +34,17 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

diff --git a/pinot-segment-spi/pom.xml b/pinot-segment-spi/pom.xml
@@ -34,11 +34,17 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml
@@ -33,10 +33,8 @@
   <url>https://pinot.apache.org/</url>
   <properties>
     <pinot.root>${basedir}/..</pinot.root>
-    <compiler.default.phase.prop>none</compiler.default.phase.prop>
-    <compiler.jdk8.phase.prop>compile</compiler.jdk8.phase.prop>
-    <toolchains.jdk8.phase.prop>validate</toolchains.jdk8.phase.prop>
   </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -186,5 +184,11 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>presto-driver</id>
+      <properties>
+        <jdk.version>8</jdk.version>
+      </properties>
+    </profile>
   </profiles>
 </project>