This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d3267dab250 [fix](fe) Detect Doris-compatible MySQL JDBC targets
(#64389)
d3267dab250 is described below
commit d3267dab2508f2c51f8032ea99bdfab099407208
Author: Socrates <[email protected]>
AuthorDate: Fri Jun 12 18:42:37 2026 +0800
[fix](fe) Detect Doris-compatible MySQL JDBC targets (#64389)
Problem Summary: JDBC catalog initializes the MySQL client as a plain
MySQL-compatible target unless the remote version_comment contains the
word Doris. Doris-compatible deployments can expose version comments
such as SelectDB, VeloDB, or enterprise cloud strings, so Doris-specific
column type overrides are skipped. As a result, Doris complex types
reported through MySQL metadata can be mapped as scalar MySQL types and
fail during scan. This change recognizes Doris-compatible version
comments and keeps using the existing SHOW FULL COLUMNS based type
override path.
### Release note
Fix JDBC catalog type mapping for Doris-compatible MySQL endpoints whose
version_comment does not contain Doris.
---
.../jdbc/client/JdbcMySQLConnectorClient.java | 15 +++++++-
.../jdbc/client/JdbcMySQLConnectorClientTest.java | 41 ++++++++++++++++++++++
.../datasource/jdbc/client/JdbcMySQLClient.java | 15 +++++++-
.../jdbc/client/JdbcMySQLClientTest.java | 37 +++++++++++++++++++
4 files changed, 106 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-connector/fe-connector-jdbc/src/main/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClient.java
b/fe/fe-connector/fe-connector-jdbc/src/main/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClient.java
index e771311f617..e69bb19e351 100644
---
a/fe/fe-connector/fe-connector-jdbc/src/main/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClient.java
+++
b/fe/fe-connector/fe-connector-jdbc/src/main/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClient.java
@@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
@@ -78,7 +79,7 @@ public class JdbcMySQLConnectorClient extends
JdbcConnectorClient {
rs = stmt.executeQuery("SHOW VARIABLES LIKE 'version_comment'");
if (rs.next()) {
String versionComment = rs.getString("Value");
- isDoris = versionComment.toLowerCase().contains("doris");
+ isDoris = isDorisCompatibleVersionComment(versionComment);
}
} catch (Exception e) {
LOG.warn("Failed to detect if remote MySQL is Doris: {}",
e.getMessage());
@@ -87,6 +88,18 @@ public class JdbcMySQLConnectorClient extends
JdbcConnectorClient {
}
}
+ static boolean isDorisCompatibleVersionComment(String versionComment) {
+ if (versionComment == null || versionComment.isEmpty()) {
+ return false;
+ }
+ String lowerVersionComment = versionComment.toLowerCase(Locale.ROOT);
+ return lowerVersionComment.contains("doris")
+ || lowerVersionComment.contains("selectdb")
+ || lowerVersionComment.contains("velodb")
+ || (lowerVersionComment.contains("enterprise version")
+ && lowerVersionComment.contains("cloud mode"));
+ }
+
public boolean isDoris() {
return isDoris;
}
diff --git
a/fe/fe-connector/fe-connector-jdbc/src/test/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClientTest.java
b/fe/fe-connector/fe-connector-jdbc/src/test/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClientTest.java
new file mode 100644
index 00000000000..5cb178a9268
--- /dev/null
+++
b/fe/fe-connector/fe-connector-jdbc/src/test/java/org/apache/doris/connector/jdbc/client/JdbcMySQLConnectorClientTest.java
@@ -0,0 +1,41 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.connector.jdbc.client;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class JdbcMySQLConnectorClientTest {
+
+ @Test
+ void testIsDorisCompatibleVersionComment() {
+
Assertions.assertTrue(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(
+ "Apache Doris version 3.1.0"));
+
Assertions.assertTrue(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(
+ "SelectDB Cloud version 4.0.5"));
+
Assertions.assertTrue(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(
+ "VeloDB version 2.1.0"));
+
Assertions.assertTrue(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(
+ "enterprise version enterprise-4.0.5-rc01-0724569463d (Cloud
Mode)"));
+
+
Assertions.assertFalse(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(
+ "MySQL Community Server - GPL"));
+
Assertions.assertFalse(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(""));
+
Assertions.assertFalse(JdbcMySQLConnectorClient.isDorisCompatibleVersionComment(null));
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
index ef43af25084..aa85fd23f80 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
@@ -36,6 +36,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -58,7 +59,7 @@ public class JdbcMySQLClient extends JdbcClient {
rs = stmt.executeQuery("SHOW VARIABLES LIKE 'version_comment'");
if (rs.next()) {
String versionComment = rs.getString("Value");
- isDoris = versionComment.toLowerCase().contains("doris");
+ isDoris = isDorisCompatibleVersionComment(versionComment);
}
} catch (SQLException | JdbcClientException e) {
closeClient();
@@ -74,6 +75,18 @@ public class JdbcMySQLClient extends JdbcClient {
this.dbType = dbType;
}
+ static boolean isDorisCompatibleVersionComment(String versionComment) {
+ if (Strings.isNullOrEmpty(versionComment)) {
+ return false;
+ }
+ String lowerVersionComment = versionComment.toLowerCase(Locale.ROOT);
+ return lowerVersionComment.contains("doris")
+ || lowerVersionComment.contains("selectdb")
+ || lowerVersionComment.contains("velodb")
+ || (lowerVersionComment.contains("enterprise version")
+ && lowerVersionComment.contains("cloud mode"));
+ }
+
@Override
public String getTableComment(String remoteDbName, String remoteTableName)
{
ImmutableList.Builder<String> tableCommentBuilder =
ImmutableList.builder();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClientTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClientTest.java
new file mode 100644
index 00000000000..010181b52e6
--- /dev/null
+++
b/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClientTest.java
@@ -0,0 +1,37 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.datasource.jdbc.client;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JdbcMySQLClientTest {
+
+ @Test
+ public void testIsDorisCompatibleVersionComment() {
+
Assert.assertTrue(JdbcMySQLClient.isDorisCompatibleVersionComment("Apache Doris
version 3.1.0"));
+
Assert.assertTrue(JdbcMySQLClient.isDorisCompatibleVersionComment("SelectDB
Cloud version 4.0.5"));
+
Assert.assertTrue(JdbcMySQLClient.isDorisCompatibleVersionComment("VeloDB
version 2.1.0"));
+ Assert.assertTrue(JdbcMySQLClient.isDorisCompatibleVersionComment(
+ "enterprise version enterprise-4.0.5-rc01-0724569463d (Cloud
Mode)"));
+
+
Assert.assertFalse(JdbcMySQLClient.isDorisCompatibleVersionComment("MySQL
Community Server - GPL"));
+
Assert.assertFalse(JdbcMySQLClient.isDorisCompatibleVersionComment(""));
+
Assert.assertFalse(JdbcMySQLClient.isDorisCompatibleVersionComment(null));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
