Remove toLowercase usage of ShardingSphereSchema (#33851)

apache · Nov 30, 2024 · b023933 · b023933
1 parent 48f03ad
commit b023933
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/...ngsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java b/...ngsphere/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/...rg/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java b/...rg/apache/shardingsphere/infra/metadata/database/schema/manager/GenericSchemaManager.java
@@ -62,7 +62,7 @@ private static ShardingSphereSchema getToBeAddedTablesBySchema(final ShardingSph
      * @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 @@ private static ShardingSphereSchema getToBeDroppedTablesBySchema(final ShardingS
      * @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/...re/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java b/...re/mode/metadata/refresher/type/view/federation/AlterViewFederationMetaDataRefresher.java
@@ -46,10 +46,7 @@ public void refresh(final MetaDataManagerPersistService metaDataManagerPersistSe
             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/...shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java b/...shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
@@ -53,7 +53,7 @@ public Collection<LocalDataQueryResultRow> getRows(final ShowTableMetaDataStatem
         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) {