This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 109569b [KYUUBI #2047] Support more MySQL JDBC driver versions
109569b is described below
commit 109569bc2bf5eed959eb30839324c47ea6e7f005
Author: sychen <[email protected]>
AuthorDate: Mon Mar 7 10:32:40 2022 +0800
[KYUUBI #2047] Support more MySQL JDBC driver versions
### _Why are the changes needed?_
Support more MySQL JDBC driver versions.
The user may use the 5.x mysql driver to connect to the kyuubi server.
https://github.com/apache/incubator-kyuubi/issues/2047
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [x] [Run
test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #2048 from cxzl25/KYUUBI-2047.
Closes #2047
03cd15f2 [sychen] Support more MySQL JDBC driver versions
Authored-by: sychen <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
.../kyuubi/server/mysql/MySQLDialectHelper.scala | 74 ++++++++++++++--------
1 file changed, 48 insertions(+), 26 deletions(-)
diff --git
a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/MySQLDialectHelper.scala
b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/MySQLDialectHelper.scala
index df9cf9b..051ab49 100644
---
a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/MySQLDialectHelper.scala
+++
b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/MySQLDialectHelper.scala
@@ -41,33 +41,14 @@ object MySQLDialectHelper {
| 'utf8mb4' as `@@character_set_server`,
| 'utf8mb4' as `@@character_set_database`
|""".stripMargin
- // mysql-connector-java:8 initialized query
- case sql
- if sql.contains("select @@session.auto_increment_increment as
auto_increment_increment, @@character_set_client as character_set_client,
@@character_set_connection as character_set_connection, @@character_set_results
as character_set_results, @@character_set_server as character_set_server,
@@collation_server as collation_server, @@collation_connection as
collation_connection, @@init_connect as init_connect, @@interactive_timeout as
interactive_timeout, @@license as license, @@low [...]
- """SELECT
- | 1 AS auto_increment_increment,
- | 'utf8mb4' AS character_set_client,
- | 'utf8mb4' AS character_set_connection,
- | 'utf8mb4' AS character_set_results,
- | 'utf8mb4' AS character_set_server,
- | 'utf8mb4_general_ci' AS collation_server,
- | 'utf8mb4_general_ci' AS collation_connection,
- | '' AS init_connect,
- | 28800 AS interactive_timeout,
- | 'Apache License 2.0' AS license,
- | 0 AS lower_case_table_names,
- | 4194304 AS max_allowed_packet,
- | 60 AS net_write_timeout,
- | 0 AS performance_schema,
- | 1048576 AS query_cache_size,
- | 'OFF' AS query_cache_type,
- |
'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
AS sql_mode,
- | 'UTC' AS system_time_zone,
- | 'SYSTEM' AS time_zone,
- | 'REPEATABLE-READ' AS transaction_isolation,
- | '28800' AS wait_timeout
- |""".stripMargin
// scalastyle:on line.size.limit
+ // mysql-connector-java:[5-8] version initialized query
+ case sql
+ if sql.contains("select @@session.auto_increment_increment") ||
+ sql.contains("select @@session.auto_increment_increment") =>
+ convertInitSQL(sql)
+ case "set names utf8mb4" =>
+ "SET NAMES=utf8mb4"
case "select @@session.transaction_read_only" =>
"select '0' as `@@session.transaction_read_only`"
case _ => origin
@@ -86,4 +67,45 @@ object MySQLDialectHelper {
}
throw MySQLErrorCode.ER_NOT_SUPPORTED_YET.toKyuubiSQLException
}
+
+ private val regexInitSQL = "@@(session\\.)?([^ ]+)".r
+
+ private def convertInitSQL(originSQL: String): String = {
+ regexInitSQL.findAllMatchIn(originSQL).map(m => {
+ val key = m.group(2)
+ if (serverVariables.contains(key)) {
+ s"'${serverVariables(key)}' AS $key"
+ } else {
+ return originSQL
+ }
+ }).mkString("SELECT ", ",", "")
+ }
+
+ private val serverVariables: Map[String, String] =
+ Map(
+ "auto_increment_increment" -> "1",
+ "character_set_client" -> "utf8mb4",
+ "character_set_connection" -> "utf8mb4",
+ "character_set_results" -> "utf8mb4",
+ "character_set_server" -> "utf8mb4",
+ "collation_connection" -> "utf8mb4_general_ci",
+ "collation_server" -> "utf8mb4_general_ci",
+ "have_query_cache" -> "YES",
+ "init_connect" -> "",
+ "interactive_timeout" -> "28800",
+ "license" -> "Apache License 2.0",
+ "lower_case_table_names" -> "0",
+ "max_allowed_packet" -> "4194304",
+ "net_buffer_length" -> "16384",
+ "net_write_timeout" -> "60",
+ "performance_schema" -> "0",
+ "query_cache_size" -> "1048576",
+ "query_cache_type" -> "OFF",
+ "sql_mode" -> ("ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,"
+
+
"NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"),
+ "system_time_zone" -> "UTC",
+ "time_zone" -> "SYSTEM",
+ "transaction_isolation" -> "REPEATABLE-READ",
+ "tx_isolation" -> "REPEATABLE-READ",
+ "wait_timeout" -> "28800")
}
