You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vo...@apache.org on 2020/03/10 18:41:36 UTC
[drill] 07/10: DRILL-7627: Update MySql version for
JdbcStoragePlugin tests and cache ~/.embedmysql for GitHub Actions workflow
run
This is an automated email from the ASF dual-hosted git repository.
volodymyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 419087675da0891cecdcdc84e669bb2e5a043053
Author: Arina Ielchiieva <ar...@gmail.com>
AuthorDate: Fri Mar 6 15:40:28 2020 +0200
DRILL-7627: Update MySql version for JdbcStoragePlugin tests and cache ~/.embedmysql for GitHub Actions workflow run
closes #2014
---
.github/workflows/ci.yml | 6 ++++++
contrib/storage-jdbc/pom.xml | 8 +++++---
.../apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0d4587..9becd45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,12 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
+ # Caches MySQL directory used for JDBC storage plugin tests
+ - name: Cache MySQL
+ uses: actions/cache@v1
+ with:
+ path: ~/.embedmysql
+ key: ${{ runner.os }}-mysql
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml
index 299d9db..303ae79 100755
--- a/contrib/storage-jdbc/pom.xml
+++ b/contrib/storage-jdbc/pom.xml
@@ -31,7 +31,9 @@
<name>contrib/jdbc-storage-plugin</name>
<properties>
- <mysql.connector.version>8.0.13</mysql.connector.version>
+ <mysql.connector.version>8.0.19</mysql.connector.version>
+ <wix-embedded-mysql.version>4.6.1</wix-embedded-mysql.version>
+ <h2.version>1.4.200</h2.version>
</properties>
<dependencies>
@@ -69,13 +71,13 @@
<dependency>
<groupId>com.wix</groupId>
<artifactId>wix-embedded-mysql</artifactId>
- <version>4.2.0</version>
+ <version>${wix-embedded-mysql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.197</version>
+ <version>${h2.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java
index 49b36c2..73b8f1c 100644
--- a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java
+++ b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
/**
* JDBC storage plugin tests against MySQL.
- * Note: it requires libaio.so library in the system
+ * Note: it requires libaio1.so library on Linux
*/
@Category(JdbcStorageTest.class)
public class TestJdbcPluginWithMySQLIT extends ClusterTest {
@@ -53,7 +53,7 @@ public class TestJdbcPluginWithMySQLIT extends ClusterTest {
String mysqlDBName = "drill_mysql_test";
int mysqlPort = QueryTestUtil.getFreePortNumber(2215, 300);
- MysqldConfig config = MysqldConfig.aMysqldConfig(Version.v5_6_21)
+ MysqldConfig config = MysqldConfig.aMysqldConfig(Version.v5_7_27)
.withPort(mysqlPort)
.withUser("mysqlUser", "mysqlPass")
.withTimeZone(DateTimeZone.UTC.toTimeZone())