More Oracle integration tests

.github/workflows/ci.yml

@@ -74,15 +74,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # checkout tags so version in Manifest is set properly
       - uses: actions/setup-java@v1
         with:
           java-version: 11
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
-          ./bin/retry ./mvnw install ${MAVEN_FAST_INSTALL} -pl '!presto-test-jdbc-compatibility,!presto-docs,!presto-server,!presto-server-rpm'
-      - name: Test JDBC clients
-        run: presto-test-jdbc-compatibility/bin/run_tests.sh
+          ./bin/retry ./mvnw install ${MAVEN_FAST_INSTALL} -pl '!presto-test-jdbc-compatibility-old-driver,!presto-docs,!presto-server,!presto-server-rpm'
+      - name: Test old JDBC vs current server
+        run: presto-test-jdbc-compatibility-old-driver/bin/run_tests.sh
+      - name: Test current JDBC vs old server
+        if: always()
+        run: ./mvnw test -B -Dair.check.skip-all -pl presto-test-jdbc-compatibility-old-server
 
   hive-tests:
     runs-on: ubuntu-latest
@@ -191,7 +196,8 @@ jobs:
             !presto-oracle,
             !presto-kudu,
             !presto-phoenix,!presto-iceberg,!presto-druid,
-            !presto-docs,!presto-server,!presto-server-rpm'
+            !presto-docs,!presto-server,!presto-server-rpm,
+            !presto-test-jdbc-compatibility-old-server'
 
   test:
     runs-on: ubuntu-latest
@@ -298,5 +304,5 @@ jobs:
           rm -rf ~/.m2/repository
       - name: Product Tests
         run: |
-          presto-product-tests-launcher/bin/run-launcher suite run --suite ${{ matrix.suite }} --config ${{ matrix.config }} --no-bind
+          presto-product-tests-launcher/bin/run-launcher suite run --suite ${{ matrix.suite }} --config ${{ matrix.config }} --no-bind --logs-dir logs/
 

pom.xml

@@ -138,7 +138,8 @@
         <module>presto-spi</module>
         <module>presto-sqlserver</module>
         <module>presto-teradata-functions</module>
-        <module>presto-test-jdbc-compatibility</module>
+        <module>presto-test-jdbc-compatibility-old-driver</module>
+        <module>presto-test-jdbc-compatibility-old-server</module>
         <module>presto-testing</module>
         <module>presto-testing-kafka</module>
         <module>presto-testng-services</module>

presto-benchto-benchmarks/src/main/resources/benchmarks/presto/tpcds.yaml

@@ -29,19 +29,19 @@ variables:
     join_distribution_type: PARTITIONED, AUTOMATIC
 
   3:
-    query: q04, q14_1, q14_2, q47
+    query: q04, q14, q47
     schema: ${tpcds_100}
     join_reordering_strategy: ELIMINATE_CROSS_JOINS, AUTOMATIC
     join_distribution_type: PARTITIONED, AUTOMATIC
 
   4:
-    query: q11, q13, q23_1, q23_2, q39_1, q39_2, q57, q64, q74, q78, q80, q88, q95
+    query: q11, q13, q23, q39, q57, q64, q74, q78, q80, q88, q95
     schema: ${tpcds_300}
     join_reordering_strategy: ELIMINATE_CROSS_JOINS, AUTOMATIC
     join_distribution_type: PARTITIONED, AUTOMATIC
 
   5:
-    query: q02, q03, q05, q06, q07, q09, q16, q17, q18, q19, q24_1, q24_2, q25, q27, q28, q29, q31, q33, q36, q38, q40, q42, q43, q46, q48, q50, q51, q52, q53, q54, q55, q56, q58, q59, q60, q61, q62, q63, q65, q66, q68, q70, q71, q75, q77, q79, q82, q87, q89, q91, q93, q97, q99
+    query: q02, q03, q05, q06, q07, q09, q16, q17, q18, q19, q24, q25, q27, q28, q29, q31, q33, q36, q38, q40, q42, q43, q46, q48, q50, q51, q52, q53, q54, q55, q56, q58, q59, q60, q61, q62, q63, q65, q66, q68, q70, q71, q75, q77, q79, q82, q87, q89, q91, q93, q97, q99
     schema: ${tpcds_1000}
     join_reordering_strategy: ELIMINATE_CROSS_JOINS, AUTOMATIC
     join_distribution_type: PARTITIONED, AUTOMATIC