Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename DatabaseTypeAwareRALUpdater #29766

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Rename DatabaseTypeAwareRALUpdater #29766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...l/update/DatabaseTypeAwareRALUpdater.java → ...e/ral/update/DatabaseAwareRALUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
package org.apache.shardingsphere.distsql.handler.type.ral.update;

import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;

/**
* Database type aware RAL updater.
* Database aware RAL updater.
*
* @param <T> type of SQL statement
*/
public interface DatabaseTypeAwareRALUpdater<T extends UpdatableRALStatement> extends DatabaseRuleRALUpdater<T> {
public interface DatabaseAwareRALUpdater<T extends UpdatableRALStatement> extends DatabaseRuleRALUpdater<T> {

/**
* Set database type.
* Set database.
*
* @param databaseType database type
* @param database database
*/
void setDatabaseType(DatabaseType databaseType);
void setDatabase(ShardingSphereDatabase database);
}
8 changes: 5 additions & 3 deletions ...rdingsphere/proxy/backend/handler/distsql/ral/UpdatableDatabaseRuleRALBackendHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@

import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.handler.type.ral.update.DatabaseRuleRALUpdater;
import org.apache.shardingsphere.distsql.handler.type.ral.update.DatabaseTypeAwareRALUpdater;
import org.apache.shardingsphere.distsql.handler.type.ral.update.DatabaseAwareRALUpdater;
import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;

import java.sql.SQLException;

Expand All @@ -44,8 +46,8 @@ public final class UpdatableDatabaseRuleRALBackendHandler<T extends UpdatableRAL
@Override
public ResponseHeader execute() throws SQLException {
DatabaseRuleRALUpdater<T> updater = TypedSPILoader.getService(DatabaseRuleRALUpdater.class, sqlStatement.getClass());
if (updater instanceof DatabaseTypeAwareRALUpdater) {
((DatabaseTypeAwareRALUpdater<T>) updater).setDatabaseType(connectionSession.getProtocolType());
if (updater instanceof DatabaseAwareRALUpdater) {
((DatabaseAwareRALUpdater<T>) updater).setDatabase(ProxyContext.getInstance().getDatabase(DatabaseNameUtils.getDatabaseName(sqlStatement, connectionSession)));
}
updater.executeUpdate(connectionSession.getDatabaseName(), (T) sqlStatement);
return new UpdateResponseHeader(sqlStatement);
Expand Down
10 changes: 5 additions & 5 deletions ...ardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.exception.storageunit.EmptyStorageUnitException;
import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException;
import org.apache.shardingsphere.distsql.handler.type.ral.update.DatabaseTypeAwareRALUpdater;
import org.apache.shardingsphere.distsql.handler.type.ral.update.DatabaseAwareRALUpdater;
import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
Expand All @@ -37,9 +37,9 @@
* Refresh table meta data handler.
*/
@Setter
public final class RefreshTableMetaDataUpdater implements DatabaseTypeAwareRALUpdater<RefreshTableMetaDataStatement> {
public final class RefreshTableMetaDataUpdater implements DatabaseAwareRALUpdater<RefreshTableMetaDataStatement> {

private DatabaseType databaseType;
private ShardingSphereDatabase database;

@Override
public void executeUpdate(final String databaseName, final RefreshTableMetaDataStatement sqlStatement) throws SQLException {
Expand Down Expand Up @@ -71,7 +71,7 @@ private void checkStorageUnit(final String databaseName, final Map<String, Stora
}

private String getSchemaName(final String databaseName, final RefreshTableMetaDataStatement sqlStatement) {
return sqlStatement.getSchemaName().isPresent() ? sqlStatement.getSchemaName().get() : new DatabaseTypeRegistry(databaseType).getDefaultSchemaName(databaseName);
return sqlStatement.getSchemaName().isPresent() ? sqlStatement.getSchemaName().get() : new DatabaseTypeRegistry(database.getProtocolType()).getDefaultSchemaName(databaseName);
}

@Override
Expand Down
Loading