(shardingsphere) branch master updated: Refactor MetaDataContextsFactory (#34393)

[zhangliang]

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 ce51aeda4e4 Refactor MetaDataContextsFactory (#34393)
ce51aeda4e4 is described below

commit ce51aeda4e41e2edc63ce011598fde21d42cf8a1
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jan 19 00:02:18 2025 +0800

    Refactor MetaDataContextsFactory (#34393)
    
    * Refactor MetaDataContextsFactory
    
    * Refactor MetaDataContextsFactory
---
 distribution/proxy/Dockerfile                                      | 1 +
 .../shardingsphere/mode/metadata/MetaDataContextsFactory.java      | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/distribution/proxy/Dockerfile b/distribution/proxy/Dockerfile
index 2c8f67c543c..b5700834f99 100644
--- a/distribution/proxy/Dockerfile
+++ b/distribution/proxy/Dockerfile
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 FROM alpine AS prepare
 
 ARG APP_NAME
diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index 62dd8cc5037..0a2928f41f3 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -25,6 +25,7 @@ import 
org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDa
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
 import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import 
org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
 import 
org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
 import 
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
@@ -253,10 +254,10 @@ public final class MetaDataContextsFactory {
     private static ShardingSphereDatabase createChangedDatabase(final String 
databaseName, final boolean internalLoadMetaData, final MetaDataPersistService 
persistService,
                                                                 final 
DatabaseConfiguration databaseConfig, final ConfigurationProperties props,
                                                                 final 
ComputeNodeInstanceContext instanceContext) throws SQLException {
+        DatabaseType protocolType = 
DatabaseTypeEngine.getProtocolType(databaseConfig, props);
         return internalLoadMetaData
-                ? ShardingSphereDatabase.create(databaseName, 
DatabaseTypeEngine.getProtocolType(databaseConfig, props),
-                        databaseConfig, instanceContext, 
persistService.getDatabaseMetaDataFacade().getSchema().load(databaseName))
-                : ShardingSphereDatabase.create(databaseName, 
DatabaseTypeEngine.getProtocolType(databaseConfig, props), databaseConfig, 
props, instanceContext);
+                ? ShardingSphereDatabase.create(databaseName, protocolType, 
databaseConfig, instanceContext, 
persistService.getDatabaseMetaDataFacade().getSchema().load(databaseName))
+                : ShardingSphereDatabase.create(databaseName, protocolType, 
databaseConfig, props, instanceContext);
     }
     
     private static ResourceMetaData getEffectiveResourceMetaData(final 
ShardingSphereDatabase database, final SwitchingResource resource) {