Skip to content

Unify variable name delegated to delegate #36847

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

Merged
merged 2 commits into from
Oct 11, 2025
Merged

Unify variable name delegated to delegate #36847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72905e7
Unify variable name delegated to delegate
terrymanu Oct 11, 2025
014bc2a
Unify variable name delegated to delegate
terrymanu Oct 11, 2025
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
4 changes: 2 additions & 2 deletions ...in/java/org/apache/shardingsphere/infra/binder/opengauss/bind/OpenGaussSQLBindEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
*/
public final class OpenGaussSQLBindEngine implements DialectSQLBindEngine {

private final PostgreSQLSQLBindEngine delegated = new PostgreSQLSQLBindEngine();
private final PostgreSQLSQLBindEngine delegate = new PostgreSQLSQLBindEngine();

@Override
public Optional<SQLStatement> bind(final SQLStatement sqlStatement, final SQLStatementBinderContext binderContext) {
return delegated.bind(sqlStatement, binderContext);
return delegate.bind(sqlStatement, binderContext);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ingsphere/infra/metadata/statistics/collector/opengauss/OpenGaussStatisticsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
*/
public final class OpenGaussStatisticsCollector implements DialectDatabaseStatisticsCollector {

private final PostgreSQLStatisticsCollector delegated = new PostgreSQLStatisticsCollector();
private final PostgreSQLStatisticsCollector delegate = new PostgreSQLStatisticsCollector();

@Override
public Optional<Collection<Map<String, Object>>> collectRowColumnValues(final String databaseName, final String schemaName, final String tableName,
final ShardingSphereMetaData metaData) throws SQLException {
return delegated.collectRowColumnValues(databaseName, schemaName, tableName, metaData);
return delegate.collectRowColumnValues(databaseName, schemaName, tableName, metaData);
}

@Override
public boolean isStatisticsTables(final Map<String, Collection<String>> schemaTables) {
return delegated.isStatisticsTables(schemaTables);
return delegate.isStatisticsTables(schemaTables);
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions ...main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public static ProxyBackendHandler newInstance(final DatabaseType databaseType, f
if (null == databaseName) {
return DatabaseProxyBackendHandlerFactory.newInstance(queryContext, connectionSession, preferPreparedStatement);
}
checkSQLExecution(queryContext, connectionSession, databaseName);
checkSQLExecution(queryContext, connectionSession.getConnectionContext().getGrantee(), databaseName);
return DatabaseAdminProxyBackendHandlerFactory.newInstance(databaseType, sqlStatementContext, connectionSession)
.orElseGet(() -> DatabaseProxyBackendHandlerFactory.newInstance(queryContext, connectionSession, preferPreparedStatement));
}
Expand Down Expand Up @@ -198,8 +198,7 @@ private static Optional<ProxyBackendHandler> findDatabaseOperateProxyBackendHand
: Optional.empty();
}

private static void checkSQLExecution(final QueryContext queryContext, final ConnectionSession connectionSession, final String databaseName) {
Grantee grantee = connectionSession.getConnectionContext().getGrantee();
private static void checkSQLExecution(final QueryContext queryContext, final Grantee grantee, final String databaseName) {
ShardingSphereDatabase database = queryContext.getMetaData().getDatabase(databaseName);
for (SQLExecutionChecker each : ShardingSphereServiceLoader.getServiceInstances(SQLExecutionChecker.class)) {
each.check(grantee, queryContext, database);
Expand Down
4 changes: 2 additions & 2 deletions ...e/shardingsphere/proxy/backend/handler/admin/DatabaseAdminProxyBackendHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public static Optional<ProxyBackendHandler> newInstance(final DatabaseType datab
* @param parameters parameters
* @return created instance
*/
public static Optional<ProxyBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext sqlStatementContext,
final ConnectionSession connectionSession, final String sql, final List<Object> parameters) {
public static Optional<ProxyBackendHandler> newInstance(final DatabaseType databaseType, final SQLStatementContext sqlStatementContext, final ConnectionSession connectionSession,
final String sql, final List<Object> parameters) {
Optional<DatabaseAdminExecutorCreator> executorCreator = DatabaseTypedSPILoader.findService(DatabaseAdminExecutorCreator.class, databaseType);
if (!executorCreator.isPresent()) {
return Optional.empty();
Expand Down
4 changes: 2 additions & 2 deletions ...d/opengauss/connector/jdbc/statement/OpenGaussStatementMemoryStrictlyFetchSizeSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
*/
public final class OpenGaussStatementMemoryStrictlyFetchSizeSetter implements StatementMemoryStrictlyFetchSizeSetter {

private final PostgreSQLStatementMemoryStrictlyFetchSizeSetter delegated = new PostgreSQLStatementMemoryStrictlyFetchSizeSetter();
private final PostgreSQLStatementMemoryStrictlyFetchSizeSetter delegate = new PostgreSQLStatementMemoryStrictlyFetchSizeSetter();

@Override
public void setFetchSize(final Statement statement) throws SQLException {
delegated.setFetchSize(statement);
delegate.setFetchSize(statement);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...e/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public final class OpenGaussAdminExecutorCreator implements DatabaseAdminExecutorCreator {

private final PostgreSQLAdminExecutorCreator delegated = new PostgreSQLAdminExecutorCreator();
private final PostgreSQLAdminExecutorCreator delegate = new PostgreSQLAdminExecutorCreator();

@Override
public Optional<DatabaseAdminExecutor> create(final SQLStatementContext sqlStatementContext) {
Expand All @@ -51,7 +51,7 @@ public Optional<DatabaseAdminExecutor> create(final SQLStatementContext sqlState
if (functionQueryExecutorCreator.accept()) {
return functionQueryExecutorCreator.create();
}
return delegated.create(sqlStatementContext, sql, databaseName, parameters);
return delegate.create(sqlStatementContext, sql, databaseName, parameters);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions ...gsphere/proxy/backend/opengauss/handler/admin/executor/OpenGaussShowVariableExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class OpenGaussShowVariableExecutor implements DatabaseAdminQueryEx

private final ShowStatement showStatement;

private final PostgreSQLShowVariableExecutor delegated;
private final PostgreSQLShowVariableExecutor delegate;

@Getter
private QueryResultMetaData queryResultMetaData;
Expand All @@ -60,7 +60,7 @@ public final class OpenGaussShowVariableExecutor implements DatabaseAdminQueryEx

public OpenGaussShowVariableExecutor(final ShowStatement showStatement) {
this.showStatement = showStatement;
delegated = new PostgreSQLShowVariableExecutor(showStatement);
delegate = new PostgreSQLShowVariableExecutor(showStatement);
}

@Override
Expand All @@ -76,9 +76,9 @@ public void execute(final ConnectionSession connectionSession) {
}

private void delegated(final ConnectionSession connectionSession) {
delegated.execute(connectionSession);
queryResultMetaData = delegated.getQueryResultMetaData();
mergedResult = delegated.getMergedResult();
delegate.execute(connectionSession);
queryResultMetaData = delegate.getQueryResultMetaData();
mergedResult = delegate.getMergedResult();
}

private interface VariableRowDataGenerator {
Expand Down
4 changes: 2 additions & 2 deletions ...dingsphere/proxy/backend/opengauss/response/header/query/OpenGaussQueryHeaderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
*/
public final class OpenGaussQueryHeaderBuilder implements QueryHeaderBuilder {

private final PostgreSQLQueryHeaderBuilder delegated = new PostgreSQLQueryHeaderBuilder();
private final PostgreSQLQueryHeaderBuilder delegate = new PostgreSQLQueryHeaderBuilder();

@Override
public QueryHeader build(final QueryResultMetaData queryResultMetaData,
final ShardingSphereDatabase database, final String columnName, final String columnLabel, final int columnIndex) throws SQLException {
return delegated.build(queryResultMetaData, database, columnName, columnLabel, columnIndex);
return delegate.build(queryResultMetaData, database, columnName, columnLabel, columnIndex);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class OpenGaussAdminExecutorFactoryTest {
@BeforeEach
void setup() throws ReflectiveOperationException {
openGaussAdminExecutorFactory = new OpenGaussAdminExecutorCreator();
Plugins.getMemberAccessor().set(OpenGaussAdminExecutorCreator.class.getDeclaredField("delegated"), openGaussAdminExecutorFactory, postgresqlAdminExecutorFactory);
Plugins.getMemberAccessor().set(OpenGaussAdminExecutorCreator.class.getDeclaredField("delegate"), openGaussAdminExecutorFactory, postgresqlAdminExecutorFactory);
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions ...work/container/compose/natived/dialect/MariaDBPipelineNativeContainerDropTableOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
*/
public final class MariaDBPipelineNativeContainerDropTableOption implements DialectPipelineNativeContainerDropTableOption {

private final DialectPipelineNativeContainerDropTableOption delegated = new MySQLPipelineNativeContainerDropTableOption();
private final DialectPipelineNativeContainerDropTableOption delegate = new MySQLPipelineNativeContainerDropTableOption();

@Override
public String getJdbcUrl(final StorageContainerConnectOption storageContainerConnectOption, final int actualDatabasePort, final String databaseName) {
return delegated.getJdbcUrl(storageContainerConnectOption, actualDatabasePort, databaseName);
return delegate.getJdbcUrl(storageContainerConnectOption, actualDatabasePort, databaseName);
}

@Override
public String getQueryAllSchemaAndTableMapperSQL(final String databaseName) {
return delegated.getQueryAllSchemaAndTableMapperSQL(databaseName);
return delegate.getQueryAllSchemaAndTableMapperSQL(databaseName);
}

@Override
public Optional<String> getDropSchemaSQL() {
return delegated.getDropSchemaSQL();
return delegate.getDropSchemaSQL();
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...rk/container/compose/natived/dialect/OpenGaussPipelineNativeContainerDropTableOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
*/
public final class OpenGaussPipelineNativeContainerDropTableOption implements DialectPipelineNativeContainerDropTableOption {

private final DialectPipelineNativeContainerDropTableOption delegated = new PostgreSQLPipelineNativeContainerDropTableOption();
private final DialectPipelineNativeContainerDropTableOption delegate = new PostgreSQLPipelineNativeContainerDropTableOption();

@Override
public String getJdbcUrl(final StorageContainerConnectOption storageContainerConnectOption, final int actualDatabasePort, final String databaseName) {
return delegated.getJdbcUrl(storageContainerConnectOption, actualDatabasePort, databaseName);
return delegate.getJdbcUrl(storageContainerConnectOption, actualDatabasePort, databaseName);
}

@Override
public String getQueryAllSchemaAndTableMapperSQL(final String databaseName) {
return delegated.getQueryAllSchemaAndTableMapperSQL(databaseName);
return delegate.getQueryAllSchemaAndTableMapperSQL(databaseName);
}

@Override
public Optional<String> getDropSchemaSQL() {
return delegated.getDropSchemaSQL();
return delegate.getDropSchemaSQL();
}

@Override
Expand Down