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 cf5a2e560d3 Add FederationMetaDataRefreshEngine (#34452)
cf5a2e560d3 is described below
commit cf5a2e560d36d0591b53cc9c7956a850c300a3d6
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 23 22:17:37 2025 +0800
Add FederationMetaDataRefreshEngine (#34452)
* Remove MetaDataRefreshEngine.DDL_STATEMENT_CLASSES
* Remove MetaDataRefreshEngine.DDL_STATEMENT_CLASSES
* Add FederationMetaDataRefreshEngine
---
.../executor/engine/DriverExecuteExecutor.java | 5 +-
.../refresher/metadata/MetaDataRefreshEngine.java | 13 ------
.../FederationMetaDataRefreshEngine.java | 54 ++++++++++++++++++++++
.../connector/StandardDatabaseConnector.java | 6 ++-
4 files changed, 61 insertions(+), 17 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
index 4c780e46c27..bffc76fc489 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java
@@ -37,7 +37,7 @@ import
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.rule.attribute.raw.RawExecutionRuleAttribute;
import org.apache.shardingsphere.infra.session.query.QueryContext;
-import
org.apache.shardingsphere.mode.metadata.refresher.metadata.MetaDataRefreshEngine;
+import
org.apache.shardingsphere.mode.metadata.refresher.metadata.federation.FederationMetaDataRefreshEngine;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.TCLStatement;
import org.apache.shardingsphere.sqlfederation.engine.SQLFederationEngine;
import
org.apache.shardingsphere.sqlfederation.executor.context.SQLFederationContext;
@@ -102,8 +102,7 @@ public final class DriverExecuteExecutor {
return null != resultSet;
}
if (sqlFederationEngine.enabled()) {
- new
MetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getMetaDataManagerPersistService(),
database, metaData.getProps())
- .refreshFederation(queryContext.getSqlStatementContext());
+ new
FederationMetaDataRefreshEngine(connection.getContextManager().getPersistServiceFacade().getMetaDataManagerPersistService(),
database).refresh(queryContext.getSqlStatementContext());
return true;
}
if (transactionExecutor.decide(queryContext)) {
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/MetaDataRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/MetaDataRefreshEngine.java
index c0f0eeb2064..831963ac202 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/MetaDataRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/MetaDataRefreshEngine.java
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.mode.metadata.refresher.metadata.federation.FederationMetaDataRefresher;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import java.sql.SQLException;
@@ -84,16 +83,4 @@ public final class MetaDataRefreshEngine {
return ((TableAvailable)
sqlStatementContext).getTablesContext().getSchemaName()
.orElseGet(() -> new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(database.getName())).toLowerCase();
}
-
- /**
- * Refresh meta data for federation.
- *
- * @param sqlStatementContext SQL statement context
- */
- @SuppressWarnings("unchecked")
- public void refreshFederation(final SQLStatementContext
sqlStatementContext) {
- Class<?> sqlStatementClass =
sqlStatementContext.getSqlStatement().getClass().getSuperclass();
- TypedSPILoader.findService(FederationMetaDataRefresher.class,
sqlStatementClass).ifPresent(
- optional -> optional.refresh(metaDataManagerPersistService,
database, getSchemaName(sqlStatementContext),
sqlStatementContext.getSqlStatement()));
- }
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/FederationMetaDataRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/FederationMetaDataRefreshEngine.java
new file mode 100644
index 00000000000..6a5a189b29b
--- /dev/null
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/metadata/federation/FederationMetaDataRefreshEngine.java
@@ -0,0 +1,54 @@
+/*
+ * 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.mode.metadata.refresher.metadata.federation;
+
+import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
+import org.apache.shardingsphere.infra.binder.context.type.TableAvailable;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
+import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
+
+/**
+ * Federation meta data refresh engine.
+ */
+@RequiredArgsConstructor
+public final class FederationMetaDataRefreshEngine {
+
+ private final MetaDataManagerPersistService metaDataManagerPersistService;
+
+ private final ShardingSphereDatabase database;
+
+ /**
+ * Refresh federation meta data.
+ *
+ * @param sqlStatementContext SQL statement context
+ */
+ @SuppressWarnings("unchecked")
+ public void refresh(final SQLStatementContext sqlStatementContext) {
+ Class<?> sqlStatementClass =
sqlStatementContext.getSqlStatement().getClass().getSuperclass();
+ TypedSPILoader.findService(FederationMetaDataRefresher.class,
sqlStatementClass).ifPresent(
+ optional -> optional.refresh(metaDataManagerPersistService,
database, getSchemaName(sqlStatementContext),
sqlStatementContext.getSqlStatement()));
+ }
+
+ private String getSchemaName(final SQLStatementContext
sqlStatementContext) {
+ return ((TableAvailable)
sqlStatementContext).getTablesContext().getSchemaName()
+ .orElseGet(() -> new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(database.getName())).toLowerCase();
+ }
+}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
index 08fa0840757..5e52556d9dc 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnector.java
@@ -55,6 +55,7 @@ import
org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import
org.apache.shardingsphere.mode.metadata.refresher.metadata.MetaDataRefreshEngine;
+import
org.apache.shardingsphere.mode.metadata.refresher.metadata.federation.FederationMetaDataRefreshEngine;
import
org.apache.shardingsphere.proxy.backend.connector.jdbc.executor.callback.ProxyJDBCExecutorCallback;
import
org.apache.shardingsphere.proxy.backend.connector.jdbc.executor.callback.ProxyJDBCExecutorCallbackFactory;
import
org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.JDBCBackendStatement;
@@ -112,6 +113,8 @@ public final class StandardDatabaseConnector implements
DatabaseConnector {
private final MetaDataRefreshEngine metaDataRefreshEngine;
+ private final FederationMetaDataRefreshEngine
federationMetaDataRefreshEngine;
+
private final Collection<Statement> cachedStatements =
Collections.newSetFromMap(new ConcurrentHashMap<>());
private final Collection<ResultSet> cachedResultSets =
Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -135,6 +138,7 @@ public final class StandardDatabaseConnector implements
DatabaseConnector {
proxySQLExecutor = new ProxySQLExecutor(driverType,
databaseConnectionManager, this, queryContext);
metaDataRefreshEngine = new MetaDataRefreshEngine(
contextManager.getPersistServiceFacade().getMetaDataManagerPersistService(),
database, contextManager.getMetaDataContexts().getMetaData().getProps());
+ federationMetaDataRefreshEngine = new
FederationMetaDataRefreshEngine(contextManager.getPersistServiceFacade().getMetaDataManagerPersistService(),
database);
}
private void checkBackendReady(final SQLStatementContext
sqlStatementContext) {
@@ -184,7 +188,7 @@ public final class StandardDatabaseConnector implements
DatabaseConnector {
return processExecuteFederation(doExecuteFederation());
}
if (proxySQLExecutor.getSqlFederationEngine().enabled()) {
-
metaDataRefreshEngine.refreshFederation(queryContext.getSqlStatementContext());
+
federationMetaDataRefreshEngine.refresh(queryContext.getSqlStatementContext());
return new
UpdateResponseHeader(queryContext.getSqlStatementContext().getSqlStatement());
}
ExecutionContext executionContext = generateExecutionContext();
