This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 b023933f600 Remove toLowercase usage of ShardingSphereSchema (#33851)
b023933f600 is described below
commit b023933f6006d0656bc5e402b8a7b494e1de2e32
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Nov 30 20:02:40 2024 +0800
Remove toLowercase usage of ShardingSphereSchema (#33851)
---
.../segment/insert/keygen/engine/GeneratedKeyContextEngine.java | 4 ++--
.../infra/metadata/database/schema/manager/GenericSchemaManager.java | 4 ++--
.../type/view/federation/AlterViewFederationMetaDataRefresher.java | 5 +----
.../handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
index 0e8563b39e6..4669b53c36f 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
@@ -50,8 +50,8 @@ public final class GeneratedKeyContextEngine {
* @param params SQL parameters
* @return generate key context
*/
- public Optional<GeneratedKeyContext> createGenerateKeyContext(final
Map<String, Integer> insertColumnNamesAndIndexes, final
List<InsertValueContext> insertValueContexts,
- final
List<Object> params) {
+ public Optional<GeneratedKeyContext> createGenerateKeyContext(final
Map<String, Integer> insertColumnNamesAndIndexes,
+ final
List<InsertValueContext> insertValueContexts, final List<Object> params) {
String tableName = insertStatement.getTable().map(optional ->
optional.getTableName().getIdentifier().getValue()).orElse("");
return findGenerateKeyColumn(tableName).map(optional ->
containsGenerateKey(insertColumnNamesAndIndexes, optional)
? findGeneratedKey(insertColumnNamesAndIndexes,
insertValueContexts, params, optional)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java
index f15e0e6e7b0..aea1204ff54 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java
@@ -62,7 +62,7 @@ public final class GenericSchemaManager {
* @return to be added tables
*/
public static Collection<ShardingSphereTable> getToBeAddedTables(final
ShardingSphereSchema reloadSchema, final ShardingSphereSchema currentSchema) {
- return reloadSchema.getAllTables().stream().filter(each ->
!each.equals(currentSchema.getTable(each.getName().toLowerCase()))).collect(Collectors.toList());
+ return reloadSchema.getAllTables().stream().filter(each ->
!each.equals(currentSchema.getTable(each.getName()))).collect(Collectors.toList());
}
/**
@@ -91,7 +91,7 @@ public final class GenericSchemaManager {
* @return to be dropped table
*/
public static Collection<ShardingSphereTable> getToBeDroppedTables(final
ShardingSphereSchema reloadSchema, final ShardingSphereSchema currentSchema) {
- return currentSchema.getAllTables().stream().filter(each ->
!reloadSchema.containsTable(each.getName().toLowerCase())).collect(Collectors.toList());
+ return currentSchema.getAllTables().stream().filter(each ->
!reloadSchema.containsTable(each.getName())).collect(Collectors.toList());
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java
index e867403d14c..8fd97e5fe20 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java
@@ -46,10 +46,7 @@ public final class AlterViewFederationMetaDataRefresher
implements FederationMet
alterSchemaMetaDataPOJO.getAlteredViews().add(new
ShardingSphereView(renameViewName, originalView));
alterSchemaMetaDataPOJO.getDroppedViews().add(viewName);
}
- Optional<String> viewDefinition = sqlStatement.getViewDefinition();
- if (viewDefinition.isPresent()) {
- alterSchemaMetaDataPOJO.getAlteredViews().add(new
ShardingSphereView(viewName, viewDefinition.get()));
- }
+ sqlStatement.getViewDefinition().ifPresent(optional ->
alterSchemaMetaDataPOJO.getAlteredViews().add(new ShardingSphereView(viewName,
optional)));
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
index d727832d01f..f0cceedc09a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
@@ -53,7 +53,7 @@ public final class ShowTableMetaDataExecutor implements
DistSQLQueryExecutor<Sho
String defaultSchema = new
DatabaseTypeRegistry(database.getProtocolType()).getDefaultSchemaName(database.getName());
ShardingSphereSchema schema = database.getSchema(defaultSchema);
return sqlStatement.getTableNames().stream()
- .filter(schema::containsTable).map(each ->
buildTableRows(database.getName(), schema,
each.toLowerCase())).flatMap(Collection::stream).collect(Collectors.toList());
+ .filter(schema::containsTable).map(each ->
buildTableRows(database.getName(), schema,
each)).flatMap(Collection::stream).collect(Collectors.toList());
}
private Collection<LocalDataQueryResultRow> buildTableRows(final String
databaseName, final ShardingSphereSchema schema, final String tableName) {
