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 2025/02/24 06:03:54 UTC
(shardingsphere) branch master updated: Fix load single table tip message and use CaseInsensitiveSet (#34770)
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 624e1704c23 Fix load single table tip message and use CaseInsensitiveSet (#34770)
624e1704c23 is described below
commit 624e1704c23618893f717e3ff2fe70344636056b
Author: ZhangCheng <ch...@apache.org>
AuthorDate: Mon Feb 24 14:03:48 2025 +0800
Fix load single table tip message and use CaseInsensitiveSet (#34770)
* Fix load single table tip message and use CaseInsensitiveSet
* Fix load single table tip message and use CaseInsensitiveSet
* Fix load single table tip message and use CaseInsensitiveSet
---
.../core/metadata/data/loader/type/SchemaMetaDataLoader.java | 3 ++-
.../metadata/data/loader/MySQLSchemaMetaDataLoaderTest.java | 3 ++-
.../data/loader/OpenGaussSchemaMetaDataLoaderTest.java | 7 ++++---
.../data/loader/PostgreSQLSchemaMetaDataLoaderTest.java | 11 ++++++-----
.../distsql/handler/update/LoadSingleTableExecutor.java | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
index f048b8574cf..b4088cd1c3e 100644
--- a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
+++ b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/data/loader/type/SchemaMetaDataLoader.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.infra.database.core.metadata.data.loader.type;
import com.cedarsoftware.util.CaseInsensitiveMap;
+import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.metadata.data.loader.MetaDataLoaderConnection;
@@ -106,7 +107,7 @@ public final class SchemaMetaDataLoader {
}
private static Collection<String> loadTableNames(final Connection connection, final String schemaName, final Collection<String> excludedTables) throws SQLException {
- Collection<String> result = new LinkedList<>();
+ Collection<String> result = new CaseInsensitiveSet<>();
try (
ResultSet resultSet = connection.getMetaData().getTables(connection.getCatalog(), schemaName, null,
new String[]{TABLE_TYPE, PARTITIONED_TABLE_TYPE, VIEW_TYPE, SYSTEM_TABLE_TYPE, SYSTEM_VIEW_TYPE})) {
diff --git a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLSchemaMetaDataLoaderTest.java b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLSchemaMetaDataLoaderTest.java
index 6a1f24deb46..78b7735b9d1 100644
--- a/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLSchemaMetaDataLoaderTest.java
+++ b/infra/database/type/mysql/src/test/java/org/apache/shardingsphere/infra/database/mysql/metadata/data/loader/MySQLSchemaMetaDataLoaderTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.database.mysql.metadata.data.loader;
+import com.cedarsoftware.util.CaseInsensitiveSet;
import org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -76,7 +77,7 @@ class MySQLSchemaMetaDataLoaderTest {
@Test
void assertLoadSchemaTableNames() throws SQLException {
- Map<String, Collection<String>> schemaTableNames = Collections.singletonMap("foo_db", Arrays.asList("tbl", "partitioned_tbl"));
+ Map<String, Collection<String>> schemaTableNames = Collections.singletonMap("foo_db", new CaseInsensitiveSet<>(Arrays.asList("tbl", "partitioned_tbl")));
assertThat(SchemaMetaDataLoader.loadSchemaTableNames("foo_db", TypedSPILoader.getService(DatabaseType.class, "MySQL"), dataSource, Collections.emptyList()), is(schemaTableNames));
}
diff --git a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussSchemaMetaDataLoaderTest.java b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussSchemaMetaDataLoaderTest.java
index 0add785fdea..b41212ec4fe 100644
--- a/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussSchemaMetaDataLoaderTest.java
+++ b/infra/database/type/opengauss/src/test/java/org/apache/shardingsphere/infra/database/opengauss/metadata/data/loader/OpenGaussSchemaMetaDataLoaderTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.database.opengauss.metadata.data.loader;
+import com.cedarsoftware.util.CaseInsensitiveSet;
import org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -82,9 +83,9 @@ class OpenGaussSchemaMetaDataLoaderTest {
private Map<String, Collection<String>> createSchemaTableNames() {
Map<String, Collection<String>> result = new LinkedHashMap<>();
- result.put("public", Arrays.asList("tbl", "partitioned_tbl"));
- result.put("schema_1", Collections.emptyList());
- result.put("schema_2", Collections.emptyList());
+ result.put("public", new CaseInsensitiveSet<>(Arrays.asList("tbl", "partitioned_tbl")));
+ result.put("schema_1", Collections.emptySet());
+ result.put("schema_2", Collections.emptySet());
return result;
}
diff --git a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLSchemaMetaDataLoaderTest.java b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLSchemaMetaDataLoaderTest.java
index 6094691c7b0..471f61647ac 100644
--- a/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLSchemaMetaDataLoaderTest.java
+++ b/infra/database/type/postgresql/src/test/java/org/apache/shardingsphere/infra/database/postgresql/metadata/data/loader/PostgreSQLSchemaMetaDataLoaderTest.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.infra.database.postgresql.metadata.data.loader;
+import com.cedarsoftware.util.CaseInsensitiveMap;
+import com.cedarsoftware.util.CaseInsensitiveSet;
import org.apache.shardingsphere.infra.database.core.metadata.data.loader.type.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -35,7 +37,6 @@ import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -82,10 +83,10 @@ class PostgreSQLSchemaMetaDataLoaderTest {
}
private Map<String, Collection<String>> createSchemaTableNames() {
- Map<String, Collection<String>> result = new LinkedHashMap<>();
- result.put("public", Arrays.asList("tbl", "partitioned_tbl"));
- result.put("schema_1", Collections.emptyList());
- result.put("schema_2", Collections.emptyList());
+ Map<String, Collection<String>> result = new CaseInsensitiveMap<>();
+ result.put("public", new CaseInsensitiveSet<>(Arrays.asList("tbl", "partitioned_tbl")));
+ result.put("schema_1", Collections.emptySet());
+ result.put("schema_2", Collections.emptySet());
return result;
}
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
index b1157fc4419..684ac0360d5 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
@@ -123,7 +123,7 @@ public final class LoadSingleTableExecutor implements DatabaseRuleCreateExecutor
if (!SingleTableConstants.ASTERISK.equals(tableName)) {
String storageUnitName = each.getStorageUnitName();
ShardingSpherePreconditions.checkState(actualTableNodes.containsKey(storageUnitName) && actualTableNodes.get(storageUnitName).get(defaultSchemaName).contains(tableName),
- () -> new TableNotFoundException(storageUnitName, tableName));
+ () -> new TableNotFoundException(tableName, storageUnitName));
}
}
}