You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/01/10 02:55:35 UTC
[shardingsphere] branch master updated: Support more precise matching by prefix length. (#23444)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 451ae0bd2db Support more precise matching by prefix length. (#23444)
451ae0bd2db is described below
commit 451ae0bd2db244a451db587272023669307280d7
Author: Chuxin Chen <ch...@qq.com>
AuthorDate: Tue Jan 10 10:55:29 2023 +0800
Support more precise matching by prefix length. (#23444)
* Support more precise matching by prefix length.
* Support more precise matching by prefix length.
---
.../infra/database/type/DatabaseTypeEngine.java | 9 +++-
.../database/type/DatabaseTypeEngineTest.java | 5 ++
.../InfraLongLengthPrefixDatabaseTypeFixture.java | 60 ++++++++++++++++++++++
...shardingsphere.infra.database.type.DatabaseType | 1 +
4 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
index cb9ded916f6..fe4a2e692d5 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
@@ -31,6 +31,7 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;
+import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -99,8 +100,8 @@ public final class DatabaseTypeEngine {
* @return database type
*/
public static DatabaseType getDatabaseType(final String url) {
- return ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class)
- .stream().filter(each -> matchURLs(url, each)).findAny().orElseGet(() -> TypedSPIRegistry.getRegisteredService(DatabaseType.class, "SQL92"));
+ return ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class).stream().filter(each -> matchURLs(url, each))
+ .max(Comparator.comparing(each -> getMatchedUrlPrefixLength(each, url))).orElseGet(() -> TypedSPIRegistry.getRegisteredService(DatabaseType.class, "SQL92"));
}
/**
@@ -130,6 +131,10 @@ public final class DatabaseTypeEngine {
return databaseType.getJdbcUrlPrefixes().stream().anyMatch(url::startsWith);
}
+ private static Integer getMatchedUrlPrefixLength(final DatabaseType databaseType, final String url) {
+ return databaseType.getJdbcUrlPrefixes().stream().filter(url::startsWith).findFirst().map(String::length).orElse(0);
+ }
+
/**
* Get trunk database type.
*
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
index ca695198302..9c6109b6b82 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngineTest.java
@@ -156,4 +156,9 @@ public final class DatabaseTypeEngineTest {
DatabaseType schemaNoSupportDatabaseType = TypedSPIRegistry.getRegisteredService(DatabaseType.class, "MySQL");
assertThat(DatabaseTypeEngine.getDefaultSchemaName(schemaNoSupportDatabaseType, "MySQL"), is("mysql"));
}
+
+ @Test
+ public void assertGetDatabaseTypeWithCorrectOrder() {
+ assertThat(DatabaseTypeEngine.getDatabaseType("jdbc:infra.fixture:long.length://localhost:3306/test").getType(), is("INFRA.FIXTURE.LONG.LENGTH"));
+ }
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/InfraLongLengthPrefixDatabaseTypeFixture.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/InfraLongLengthPrefixDatabaseTypeFixture.java
new file mode 100644
index 00000000000..b17fbf80aa8
--- /dev/null
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/InfraLongLengthPrefixDatabaseTypeFixture.java
@@ -0,0 +1,60 @@
+/*
+ * 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.shardingsphere.infra.fixture;
+
+import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class InfraLongLengthPrefixDatabaseTypeFixture implements DatabaseType {
+
+ @Override
+ public QuoteCharacter getQuoteCharacter() {
+ return QuoteCharacter.BACK_QUOTE;
+ }
+
+ @Override
+ public Collection<String> getJdbcUrlPrefixes() {
+ return Collections.singleton("jdbc:infra.fixture:long.length:");
+ }
+
+ @Override
+ public DataSourceMetaData getDataSourceMetaData(final String url, final String username) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public Collection<String> getSystemSchemas() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public String getType() {
+ return "INFRA.FIXTURE.LONG.LENGTH";
+ }
+}
diff --git a/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.type.DatabaseType b/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.type.DatabaseType
index 2ed2edd6f63..205811a61c4 100644
--- a/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.type.DatabaseType
+++ b/infra/common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.database.type.DatabaseType
@@ -16,3 +16,4 @@
#
org.apache.shardingsphere.infra.fixture.InfraDatabaseTypeFixture
+org.apache.shardingsphere.infra.fixture.InfraLongLengthPrefixDatabaseTypeFixture