(hive) branch master updated: HIVE-28597: Upgrade to 8.4.3 LTS version of MySQL and 11.4 LTS version of MariaDB (Kiran Velumuri reviewed by Denys Kuzmenko, Laszlo Bodor, Stamatis Zampetakis)

[zabetak]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 317a9b15a95 HIVE-28597: Upgrade to 8.4.3 LTS version of MySQL and 11.4 
LTS version of MariaDB (Kiran Velumuri reviewed by Denys Kuzmenko, Laszlo 
Bodor, Stamatis Zampetakis)
317a9b15a95 is described below

commit 317a9b15a9537b7ecb360e066d8a584b887489f2
Author: Kiran Velumuri <kiranvelumuri...@gmail.com>
AuthorDate: Mon Mar 17 17:56:47 2025 +0530

    HIVE-28597: Upgrade to 8.4.3 LTS version of MySQL and 11.4 LTS version of 
MariaDB (Kiran Velumuri reviewed by Denys Kuzmenko, Laszlo Bodor, Stamatis 
Zampetakis)
    
    Close apache/hive#5525
---
 .../src/main/java/org/apache/hadoop/hive/ql/externalDB/MariaDB.java | 2 +-
 .../java/org/apache/hadoop/hive/ql/externalDB/MySQLExternalDB.java  | 6 +++---
 .../org/apache/hadoop/hive/metastore/dbinstall/rules/Mariadb.java   | 2 +-
 .../org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MariaDB.java 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MariaDB.java
index c0d4bde7091..811c1107281 100644
--- 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MariaDB.java
+++ 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MariaDB.java
@@ -36,7 +36,7 @@ public String getJdbcDriver() {
     return "org.mariadb.jdbc.Driver";
   }
 
-  public String getDockerImageName() { return "mariadb:10.2"; }
+  public String getDockerImageName() { return "mariadb:11.4"; }
 
   public String[] getDockerAdditionalArgs() {
     return new String[] {"-p", "3309:3306",
diff --git 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MySQLExternalDB.java
 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MySQLExternalDB.java
index 1a42f1fd274..c7c45c90997 100644
--- 
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MySQLExternalDB.java
+++ 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/MySQLExternalDB.java
@@ -42,7 +42,7 @@ public String getJdbcDriver() {
         return "com.mysql.jdbc.Driver";
     }
 
-    public String getDockerImageName() { return "mysql:5.7.37"; }
+    public String getDockerImageName() { return "mysql:8.4.3"; }
 
     public String[] getDockerAdditionalArgs() {
         return new String[] {"-p", "3306:3306",
@@ -53,8 +53,8 @@ public String[] getDockerAdditionalArgs() {
     }
 
     public boolean isContainerReady(ProcessResults pr) {
-        Pattern pat = Pattern.compile("ready for connections");
+        Pattern pat = Pattern.compile("mysqld.*ready for 
connections.*port.*3306");
         Matcher m = pat.matcher(pr.stderr);
-        return m.find() && m.find();
+        return m.find();
     }
 }
\ No newline at end of file
diff --git 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mariadb.java
 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mariadb.java
index 615337971bd..f32d6730a7b 100644
--- 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mariadb.java
+++ 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mariadb.java
@@ -25,7 +25,7 @@ public class Mariadb extends DatabaseRule {
 
   @Override
   public String getDockerImageName() {
-    return "mariadb:10.2";
+    return "mariadb:11.4";
   }
 
   @Override
diff --git 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java
 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java
index 7b6abc4dc33..b4dba4dbbac 100644
--- 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java
+++ 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java
@@ -27,7 +27,7 @@ public class Mysql extends DatabaseRule {
 
   @Override
   public String getDockerImageName() {
-    return "mysql:5.7.37";
+    return "mysql:8.4.3";
   }
 
   @Override
@@ -67,9 +67,9 @@ public String getInitialJdbcUrl(String hostAddress) {
 
   @Override
   public boolean isContainerReady(ProcessResults pr) {
-    Pattern pat = Pattern.compile("ready for connections");
+    Pattern pat = Pattern.compile("mysqld.*ready for connections.*port.*3306");
     Matcher m = pat.matcher(pr.stderr);
-    return m.find() && m.find();
+    return m.find();
   }
 
   @Override