You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/10/04 14:09:16 UTC
(shardingsphere) branch master updated: Refactor DistSQL handler package ownership (#40052)
This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 16d7c3f38b0 Refactor DistSQL handler package ownership (#40052)
16d7c3f38b0 is described below
commit 16d7c3f38b009076dd21b38f61445543c40e5279
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Oct 4 22:09:09 2026 +0800
Refactor DistSQL handler package ownership (#40052)
* Strengthen MCP startup log assertions and simplify TABLE test fixtures
* Refactor DistSQL handler package ownership
---
...oadcastRuleConfigurationToDistSQLConverter.java | 2 +-
.../query/BroadcastCountResultRowBuilder.java | 2 +-
.../query/ShowBroadcastTableRuleExecutor.java | 4 +-
.../update/CreateBroadcastTableRuleExecutor.java | 2 +-
.../update/DropBroadcastTableRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...astRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../query/BroadcastCountResultRowBuilderTest.java | 2 +-
...EncryptRuleConfigurationToDistSQLConverter.java | 4 +-
.../query/EncryptCountResultRowBuilder.java | 2 +-
.../handler/query/ShowEncryptRuleExecutor.java | 4 +-
.../handler/update/AlterEncryptRuleExecutor.java | 4 +-
.../handler/update/CreateEncryptRuleExecutor.java | 2 +-
.../handler/update/DropEncryptRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...yptRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../query/EncryptCountResultRowBuilderTest.java | 2 +-
.../MaskRuleConfigurationToDistSQLConverter.java | 4 +-
.../handler/query/MaskCountResultRowBuilder.java | 2 +-
.../handler/query/ShowMaskRuleExecutor.java | 4 +-
.../handler/update/AlterMaskRuleExecutor.java | 4 +-
.../handler/update/CreateMaskRuleExecutor.java | 2 +-
.../handler/update/DropMaskRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...askRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../query/MaskCountResultRowBuilderTest.java | 2 +-
.../handler/update/AlterMaskRuleExecutorTest.java | 2 +-
.../handler/update/CreateMaskRuleExecutorTest.java | 2 +-
...littingRuleConfigurationToDistSQLConverter.java | 4 +-
...UsedReadwriteSplittingStorageUnitRetriever.java | 2 +-
.../ReadwriteSplittingCountResultRowBuilder.java | 2 +-
.../query/ShowReadwriteSplittingRuleExecutor.java | 4 +-
...wStatusFromReadwriteSplittingRulesExecutor.java | 4 +-
.../AlterReadwriteSplittingRuleExecutor.java | 4 +-
...eadwriteSplittingStorageUnitStatusExecutor.java | 8 +-
.../CreateReadwriteSplittingRuleExecutor.java | 2 +-
.../update/DropReadwriteSplittingRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...ecutor.resource.spi.InUsedStorageUnitRetriever} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...dler.executor.spi.update.DistSQLUpdateExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...ingRuleConfigurationToDistSQLConverterTest.java | 2 +-
...ReadwriteSplittingStorageUnitRetrieverTest.java | 2 +-
...eadwriteSplittingCountResultRowBuilderTest.java | 2 +-
...tusFromReadwriteSplittingRulesExecutorTest.java | 2 +-
.../AlterReadwriteSplittingRuleExecutorTest.java | 2 +-
...riteSplittingStorageUnitStatusExecutorTest.java | 2 +-
.../CreateReadwriteSplittingRuleExecutorTest.java | 2 +-
.../DropReadwriteSplittingRuleExecutorTest.java | 2 +-
.../ShadowRuleConfigurationToDistSQLConverter.java | 4 +-
.../query/InUsedShadowStorageUnitRetriever.java | 2 +-
.../handler/query/ShadowCountResultRowBuilder.java | 2 +-
.../query/ShowDefaultShadowAlgorithmExecutor.java | 4 +-
.../query/ShowShadowAlgorithmsExecutor.java | 4 +-
.../handler/query/ShowShadowRuleExecutor.java | 4 +-
.../query/ShowShadowTableRulesExecutor.java | 4 +-
.../AlterDefaultShadowAlgorithmExecutor.java | 4 +-
.../handler/update/AlterShadowRuleExecutor.java | 4 +-
.../CreateDefaultShadowAlgorithmExecutor.java | 2 +-
.../handler/update/CreateShadowRuleExecutor.java | 2 +-
.../update/DropDefaultShadowAlgorithmExecutor.java | 4 +-
.../update/DropShadowAlgorithmExecutor.java | 4 +-
.../handler/update/DropShadowRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...ecutor.resource.spi.InUsedStorageUnitRetriever} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...dowRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../InUsedShadowStorageUnitRetrieverTest.java | 2 +-
.../query/ShadowCountResultRowBuilderTest.java | 2 +-
.../AlterDefaultShadowAlgorithmExecutorTest.java | 2 +-
.../update/AlterShadowRuleExecutorTest.java | 2 +-
.../CreateDefaultShadowAlgorithmExecutorTest.java | 2 +-
.../update/CreateShadowRuleExecutorTest.java | 2 +-
.../DropDefaultShadowAlgorithmExecutorTest.java | 2 +-
.../update/DropShadowAlgorithmExecutorTest.java | 2 +-
.../handler/update/DropShadowRuleExecutorTest.java | 2 +-
...hardingRuleConfigurationToDistSQLConverter.java | 4 +-
.../query/InUsedShardingStorageUnitRetriever.java | 2 +-
.../query/ShardingCountResultRowBuilder.java | 2 +-
.../query/ShowDefaultShardingStrategyExecutor.java | 4 +-
.../query/ShowShardingAlgorithmExecutor.java | 4 +-
.../query/ShowShardingAuditorsExecutor.java | 4 +-
.../ShowShardingKeyGenerateStrategiesExecutor.java | 4 +-
.../query/ShowShardingKeyGeneratorExecutor.java | 4 +-
.../query/ShowShardingTableNodesExecutor.java | 6 +-
.../ShowShardingTableReferenceRuleExecutor.java | 4 +-
.../query/ShowShardingTableRuleExecutor.java | 4 +-
...howShardingTableRulesUsedAlgorithmExecutor.java | 4 +-
.../ShowShardingTableRulesUsedAuditorExecutor.java | 4 +-
...ShardingTableRulesUsedKeyGeneratorExecutor.java | 4 +-
.../ShowUnusedShardingAlgorithmsExecutor.java | 4 +-
.../query/ShowUnusedShardingAuditorsExecutor.java | 4 +-
.../ShowUnusedShardingKeyGeneratorExecutor.java | 4 +-
.../AlterDefaultShardingStrategyExecutor.java | 4 +-
.../AlterShardingKeyGenerateStrategyExecutor.java | 4 +-
.../update/AlterShardingKeyGeneratorExecutor.java | 4 +-
.../AlterShardingTableReferenceRuleExecutor.java | 4 +-
.../update/AlterShardingTableRuleExecutor.java | 4 +-
.../CreateDefaultShardingStrategyExecutor.java | 2 +-
.../CreateShardingKeyGenerateStrategyExecutor.java | 2 +-
.../update/CreateShardingKeyGeneratorExecutor.java | 2 +-
.../CreateShardingTableReferenceRuleExecutor.java | 4 +-
.../update/CreateShardingTableRuleExecutor.java | 2 +-
.../DropDefaultShardingStrategyExecutor.java | 4 +-
.../update/DropShardingAlgorithmExecutor.java | 4 +-
.../update/DropShardingAuditorExecutor.java | 4 +-
.../DropShardingKeyGenerateStrategyExecutor.java | 4 +-
.../update/DropShardingKeyGeneratorExecutor.java | 4 +-
.../update/DropShardingTableReferenceExecutor.java | 4 +-
.../update/DropShardingTableRuleExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...ecutor.resource.spi.InUsedStorageUnitRetriever} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...ingRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../InUsedShardingStorageUnitRetrieverTest.java | 2 +-
.../query/ShardingCountResultRowBuilderTest.java | 2 +-
.../query/ShowShardingTableNodesExecutorTest.java | 2 +-
.../DistSQLConnectionContext.java | 2 +-
.../prepare}/DatabaseNameUtils.java | 2 +-
.../prepare}/DistSQLExecutorAwareSetter.java | 9 +-
.../prepare}/DistSQLExecutorRequiredChecker.java | 4 +-
.../engine/query/DistSQLQueryExecuteEngine.java | 8 +-
.../engine/update/DistSQLUpdateExecuteEngine.java | 24 ++---
.../DatabaseRuleDefinitionExecuteEngine.java | 8 +-
.../DatabaseRuleDefinitionExecutorFactory.java | 4 +-
.../rule/database/DatabaseRuleOperator.java | 2 +-
.../rule/database/DatabaseRuleOperatorFactory.java | 16 ++--
.../operator}/AlterDatabaseRuleOperator.java | 6 +-
.../operator}/CreateDatabaseRuleOperator.java | 6 +-
.../operator}/DropDatabaseRuleOperator.java | 6 +-
.../global/GlobalRuleDefinitionExecuteEngine.java | 4 +-
.../GlobalRuleDefinitionExecutorFactory.java | 4 +-
.../DistSQLExecutorConnectionContextAware.java | 4 +-
.../aware/DistSQLExecutorDatabaseAware.java | 2 +-
.../aware/DistSQLExecutorRuleAware.java | 2 +-
.../computenode/SetComputeNodeStateExecutor.java | 6 +-
.../computenode/ShowComputeNodeInfoExecutor.java | 4 +-
.../computenode/ShowComputeNodeModeExecutor.java | 4 +-
.../computenode/ShowComputeNodesExecutor.java | 4 +-
.../convert/AlgorithmDistSQLConverter.java | 2 +-
.../convert}/ConvertYamlConfigurationExecutor.java | 13 ++-
.../convert/DistSQLScriptConstants.java | 2 +-
.../spi/RuleConfigurationToDistSQLConverter.java | 2 +-
.../export/ClusterExportMetaDataGenerator.java | 6 +-
.../export/DatabaseExportMetaDataGenerator.java | 2 +-
.../ExportDatabaseConfigurationExecutor.java | 9 +-
.../export/ExportMetaDataExecutor.java | 7 +-
.../export/ExportStorageNodesExecutor.java | 10 +-
.../export/model}/ExportedClusterInfo.java | 2 +-
.../export/model}/ExportedMetaData.java | 2 +-
.../export/model}/ExportedSnapshotInfo.java | 2 +-
.../export/model}/ExportedStorageNode.java | 2 +-
.../export/model}/ExportedStorageNodes.java | 2 +-
.../export/spi/ExportedSnapshotInfoGenerator.java | 4 +-
.../ImportDatabaseConfigurationExecutor.java | 6 +-
.../imports/ImportMetaDataExecutor.java | 8 +-
.../imports/MetaDataImportExecutor.java | 8 +-
.../YamlDatabaseConfigurationImportExecutor.java | 8 +-
.../yaml/YamlDataSourceConfiguration.java | 2 +-
.../yaml/YamlDatabaseConfiguration.java | 2 +-
.../yaml/YamlExportedServerConfiguration.java | 2 +-
.../YamlDataSourceConfigurationSwapper.java | 4 +-
.../updatable => }/lock/LockClusterExecutor.java | 6 +-
.../updatable => }/lock/LockClusterOperation.java | 2 +-
.../updatable => }/lock/UnlockClusterExecutor.java | 6 +-
.../RefreshDatabaseMetaDataExecutor.java | 4 +-
.../RefreshTableMetaDataExecutor.java | 6 +-
.../ShowTableMetaDataExecutor.java | 6 +-
.../plugin/PluginMetaDataQueryResultRow.java | 2 +-
.../{ral => }/plugin/ShowPluginsExecutor.java | 4 +-
.../executor/{rul => preview}/PreviewExecutor.java | 12 +--
.../spi/PreviewExecutionUnitGenerator.java | 4 +-
.../DistSQLExecutorClusterModeRequired.java | 2 +-
.../DistSQLExecutorCurrentRuleRequired.java | 2 +-
.../resource/AlterStorageUnitExecutor.java | 6 +-
.../resource/RegisterStorageUnitExecutor.java | 6 +-
.../resource/ShowLogicalTablesExecutor.java | 6 +-
.../resource/ShowRulesUsedStorageUnitExecutor.java | 8 +-
.../resource/ShowStorageUnitExecutor.java | 6 +-
.../resource/UnregisterStorageUnitExecutor.java | 6 +-
.../resource/spi/InUsedStorageUnitRetriever.java | 2 +-
.../executor/{rql => }/rule/RuleCountExecutor.java | 8 +-
.../{rql => }/rule/spi/CountResultRowBuilder.java | 2 +-
.../spi/query}/DistSQLQueryExecutor.java | 2 +-
.../spi/update}/AdvancedDistSQLUpdateExecutor.java | 2 +-
.../spi/update}/DistSQLUpdateExecutor.java | 2 +-
.../database/DatabaseRuleDefinitionExecutor.java | 6 +-
.../database/type/DatabaseRuleAlterExecutor.java | 4 +-
.../database/type/DatabaseRuleCreateExecutor.java | 4 +-
.../database/type/DatabaseRuleDropExecutor.java | 4 +-
.../rule}/global/GlobalRuleDefinitionExecutor.java | 4 +-
.../{ral/common => variable}/DistSQLVariable.java | 2 +-
.../variable/SetDistVariableExecutor.java | 4 +-
.../variable/ShowDistVariableExecutor.java | 9 +-
.../variable/ShowDistVariablesExecutor.java | 9 +-
.../{executor/export => util}/ExportUtils.java | 2 +-
...l.handler.engine.query.spi.DistSQLQueryExecutor | 33 -------
...handler.engine.update.spi.DistSQLUpdateExecutor | 28 ------
...handler.executor.spi.query.DistSQLQueryExecutor | 33 +++++++
...ndler.executor.spi.update.DistSQLUpdateExecutor | 28 ++++++
.../DistSQLExecutorConcurrentIsolationTest.java | 8 +-
.../FixtureDatabaseRuleDefinitionExecutor.java | 2 +-
.../fixture/FixtureDistSQLQueryExecutor.java | 4 +-
.../fixture/FixtureDistSQLUpdateExecutor.java | 4 +-
.../prepare}/DatabaseNameUtilsTest.java | 2 +-
.../prepare}/DistSQLExecutorAwareSetterTest.java | 9 +-
.../update/DistSQLUpdateExecuteEngineTest.java | 20 ++--
.../DatabaseRuleDefinitionExecuteEngineTest.java | 6 +-
.../database/DatabaseRuleOperatorFactoryTest.java | 16 ++--
.../operator}/AlterDatabaseRuleOperatorTest.java | 4 +-
.../operator}/DropDatabaseRuleOperatorTest.java | 4 +-
.../yaml/YamlDatabaseConfigurationTest.java | 2 +-
.../YamlDataSourceConfigurationSwapperTest.java | 4 +-
.../lock/LockClusterExecutorTest.java | 4 +-
.../plugin/PluginMetaDataQueryResultRowTest.java | 2 +-
.../{ral => }/plugin/ShowPluginsExecutorTest.java | 4 +-
.../resource/AlterStorageUnitExecutorTest.java | 2 +-
.../resource/RegisterStorageUnitExecutorTest.java | 2 +-
.../resource/ShowLogicalTablesExecutorTest.java | 2 +-
.../ShowRulesUsedStorageUnitExecutorTest.java | 2 +-
.../resource/ShowStorageUnitExecutorTest.java | 2 +-
.../UnregisterStorageUnitExecutorTest.java | 2 +-
.../fixture/FixtureInUsedStorageUnitRetriever.java | 4 +-
.../type/DatabaseRuleDropExecutorTest.java | 2 +-
...xecutor.resource.spi.InUsedStorageUnitRetriever | 2 +-
...tor.rql.resource.spi.InUsedStorageUnitRetriever | 18 ----
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...dler.executor.spi.update.DistSQLUpdateExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
.../reachability-metadata.json | 104 ++++++++++-----------
.../core/statement/DistSQLStatementExecutor.java | 2 +-
.../statement/DistSQLStatementExecutorTest.java | 2 +-
.../handler/query/ShowAuthorityRuleExecutor.java | 4 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
.../update/AlterTransmissionRuleExecutor.java | 2 +-
...dler.executor.spi.update.DistSQLUpdateExecutor} | 0
.../update/AlterTransmissionRuleExecutorTest.java | 2 +-
.../query/ShowStreamingJobStatusExecutor.java | 2 +-
.../handler/query/ShowStreamingListExecutor.java | 2 +-
.../handler/query/ShowStreamingRuleExecutor.java | 2 +-
.../handler/update/DropStreamingExecutor.java | 2 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...dler.executor.spi.update.DistSQLUpdateExecutor} | 0
.../query/ShowMigrationCheckStatusExecutor.java | 2 +-
.../query/ShowMigrationJobStatusExecutor.java | 2 +-
.../handler/query/ShowMigrationListExecutor.java | 2 +-
.../handler/query/ShowMigrationRuleExecutor.java | 2 +-
.../ShowMigrationSourceStorageUnitsExecutor.java | 2 +-
.../handler/update/CheckMigrationJobExecutor.java | 2 +-
.../handler/update/CommitMigrationExecutor.java | 2 +-
.../handler/update/DropMigrationCheckExecutor.java | 2 +-
.../handler/update/MigrateTableExecutor.java | 6 +-
...RegisterMigrationSourceStorageUnitExecutor.java | 4 +-
.../handler/update/RollbackMigrationExecutor.java | 2 +-
.../update/StartMigrationCheckExecutor.java | 2 +-
.../handler/update/StartMigrationExecutor.java | 2 +-
.../handler/update/StopMigrationCheckExecutor.java | 2 +-
.../handler/update/StopMigrationExecutor.java | 2 +-
...registerMigrationSourceStorageUnitExecutor.java | 2 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...dler.executor.spi.update.DistSQLUpdateExecutor} | 0
.../GlobalClockExportedSnapshotInfoGenerator.java | 4 +-
.../handler/query/ShowGlobalClockRuleExecutor.java | 4 +-
.../update/AlterGlobalClockRuleExecutor.java | 2 +-
...ation.export.spi.ExportedSnapshotInfoGenerator} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...pdate.rule.global.GlobalRuleDefinitionExecutor} | 0
...obalClockExportedSnapshotInfoGeneratorTest.java | 4 +-
.../SingleRuleConfigurationToDistSQLConverter.java | 2 +-
.../query/InUsedSingleStorageUnitRetriever.java | 2 +-
.../ShowDefaultSingleTableStorageUnitExecutor.java | 4 +-
.../handler/query/ShowSingleTablesExecutor.java | 6 +-
.../query/ShowUnloadedSingleTablesExecutor.java | 6 +-
.../handler/query/SingleCountResultRowBuilder.java | 2 +-
.../handler/update/LoadSingleTableExecutor.java | 2 +-
.../SetDefaultSingleTableStorageUnitExecutor.java | 2 +-
.../handler/update/UnloadSingleTableExecutor.java | 4 +-
...onvert.spi.RuleConfigurationToDistSQLConverter} | 0
...ecutor.resource.spi.InUsedStorageUnitRetriever} | 0
...andler.executor.rule.spi.CountResultRowBuilder} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
...gleRuleConfigurationToDistSQLConverterTest.java | 2 +-
.../InUsedSingleStorageUnitRetrieverTest.java | 2 +-
.../query/ShowSingleTablesExecutorTest.java | 2 +-
.../ShowUnloadedSingleTablesExecutorTest.java | 2 +-
.../query/SingleCountResultRowBuilderTest.java | 2 +-
.../update/LoadSingleTableExecutorTest.java | 6 +-
.../update/UnloadSingleTableExecutorTest.java | 2 +-
...SQLFederationPreviewExecutionUnitGenerator.java | 4 +-
.../query/ShowSQLFederationRuleExecutor.java | 4 +-
.../update/AlterSQLFederationRuleExecutor.java | 2 +-
...utor.preview.spi.PreviewExecutionUnitGenerator} | 0
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...pdate.rule.global.GlobalRuleDefinitionExecutor} | 0
...ederationPreviewExecutionUnitGeneratorTest.java | 4 +-
.../handler/query/ParseDistSQLExecutor.java | 6 +-
.../handler/query/ShowSQLParserRuleExecutor.java | 4 +-
.../handler/update/AlterSQLParserRuleExecutor.java | 2 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...pdate.rule.global.GlobalRuleDefinitionExecutor} | 0
.../query/ShowSQLTranslatorRuleExecutor.java | 4 +-
.../update/AlterSQLTranslatorRuleExecutor.java | 2 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...pdate.rule.global.GlobalRuleDefinitionExecutor} | 0
.../handler/query/ShowTransactionRuleExecutor.java | 4 +-
.../update/AlterTransactionRuleExecutor.java | 2 +-
...andler.executor.spi.query.DistSQLQueryExecutor} | 0
...pdate.rule.global.GlobalRuleDefinitionExecutor} | 0
.../distsql/DistSQLQueryProxyBackendHandler.java | 2 +-
.../distsql/DistSQLUpdateProxyBackendHandler.java | 2 +-
.../handler/distsql/DistSQLExecutorSPITest.java | 13 ++-
.../DistSQLQueryProxyBackendHandlerTest.java | 2 +-
.../fixture/FixtureDatabaseRuleCreateExecutor.java | 2 +-
.../ShowComputeNodeInfoExecutorTest.java | 4 +-
.../ShowComputeNodeModeExecutorTest.java | 4 +-
.../computenode/ShowComputeNodesExecutorTest.java | 4 +-
.../ExportDatabaseConfigurationExecutorTest.java | 4 +-
.../export/ExportMetaDataExecutorTest.java | 12 +--
.../export/ExportStorageNodesExecutorTest.java | 4 +-
.../export/ShowTableMetaDataExecutorTest.java | 2 +-
.../variable/ShowDistVariableExecutorTest.java | 8 +-
.../variable/ShowDistVariablesExecutorTest.java | 6 +-
.../yaml/ConvertYamlConfigurationExecutorTest.java | 8 +-
.../SetComputeNodeStateExecutorTest.java | 4 +-
.../ImportDatabaseConfigurationExecutorTest.java | 4 +-
.../imports/ImportMetaDataExecutorTest.java | 4 +-
.../updatable/lock/LockClusterOperationTest.java | 2 +-
.../updatable/lock/UnlockClusterExecutorTest.java | 4 +-
.../RefreshDatabaseMetaDataExecutorTest.java | 4 +-
.../refresh/RefreshTableMetaDataExecutorTest.java | 4 +-
.../variable/SetDistVariableExecutorTest.java | 4 +-
.../handler/distsql/rul/PreviewExecutorTest.java | 6 +-
.../util/ClusterExportMetaDataGeneratorTest.java | 6 +-
.../util/DatabaseExportMetaDataGeneratorTest.java | 2 +-
.../proxy/backend/util/ExportUtilsTest.java | 2 +-
.../backend/util/MetaDataImportExecutorTest.java | 10 +-
...amlDatabaseConfigurationImportExecutorTest.java | 8 +-
...e.rule.database.DatabaseRuleDefinitionExecutor} | 0
.../DistSQLDatabaseRuleQueryExecutorAssert.java | 2 +-
.../DistSQLGlobalRuleQueryExecutorAssert.java | 2 +-
.../DistSQLGlobalRuleDefinitionExecutorAssert.java | 2 +-
357 files changed, 686 insertions(+), 698 deletions(-)
diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
index 8aa309d2ebc..7634621ea02 100644
--- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
+++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverter.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.converter;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
/**
* Broadcast rule configuration to DistSQL converter.
diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilder.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilder.java
index 0f931761ab3..ef0ea1a31e1 100644
--- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilder.java
+++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilder.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.broadcast.distsql.handler.query;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import java.util.Collection;
diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
index 4ee66699d57..94831ede058 100644
--- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
+++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.broadcast.distsql.handler.query;
import lombok.Setter;
import org.apache.shardingsphere.broadcast.distsql.statement.ShowBroadcastTableRulesStatement;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java
index b90431a0621..67845772f59 100644
--- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java
+++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleExecutor.java
@@ -22,7 +22,7 @@ import lombok.Setter;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.EmptyStorageUnitException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
index bba8deef439..7300a52a99e 100644
--- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
+++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleExecutor.java
@@ -22,8 +22,8 @@ import lombok.Setter;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
copy from features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
copy to features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverterTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverterTest.java
index f9d1659e130..c799fcfbfe7 100644
--- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverterTest.java
+++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/converter/BroadcastRuleConfigurationToDistSQLConverterTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.broadcast.distsql.handler.converter;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilderTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilderTest.java
index 9c3fdaf048c..536cf05f161 100644
--- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilderTest.java
+++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/BroadcastCountResultRowBuilderTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.broadcast.distsql.handler.query;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
index 31855cb9663..04dd695bd08 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverter.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.encrypt.distsql.handler.converter;
import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.AlgorithmDistSQLConverter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.AlgorithmDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnRuleConfiguration;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilder.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilder.java
index fbcbf2fa730..87db1e812eb 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilder.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.encrypt.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.table.TableMapperRuleAttribute;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index 0b31b804664..b389313e73f 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.encrypt.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
index 397388c361f..6731836af33 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.encrypt.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java
index 2324ac64ce4..c96f75d0301 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.encrypt.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.distsql.handler.converter.EncryptRuleStatementConverter;
import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment;
diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
index ab2a796b3a3..75653cfff90 100644
--- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
+++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.encrypt.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptTableRuleConfiguration;
import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement;
diff --git a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverterTest.java
index 1baf8506edf..75571ac1b0b 100644
--- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverterTest.java
+++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.encrypt.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
import org.apache.shardingsphere.encrypt.config.rule.EncryptColumnRuleConfiguration;
diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilderTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilderTest.java
index edd0a3ee89b..c5688a978d6 100644
--- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilderTest.java
+++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.encrypt.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
index ce64eb2f10b..0dc55e8b232 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverter.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mask.distsql.handler.converter;
import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.AlgorithmDistSQLConverter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.AlgorithmDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
import org.apache.shardingsphere.mask.config.rule.MaskColumnRuleConfiguration;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilder.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilder.java
index 574e10af650..89e8fa6e24c 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilder.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.table.TableMapperRuleAttribute;
import org.apache.shardingsphere.mask.rule.MaskRule;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
index 20d74ad83c5..6286250e375 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mask.config.rule.MaskTableRuleConfiguration;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
index de485c3fb0f..0b642c8ab5a 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.mask.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java
index 7292b799f3a..e219d0f0013 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
index 280c65fc367..379d89cf75d 100644
--- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
+++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.mask.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverterTest.java
index 9387bf9dff6..2bdd7c52c9a 100644
--- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverterTest.java
+++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mask.config.MaskRuleConfiguration;
diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilderTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilderTest.java
index 60466c4658f..54018831593 100644
--- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilderTest.java
+++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/MaskCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.attribute.table.TableMapperRuleAttribute;
diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
index e5a96add029..e5d4d9499b6 100644
--- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
+++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
index 19799f14665..2d2eaaed510 100644
--- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
+++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mask.distsql.handler.update;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
index 5fed7c459ca..427d707a637 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverter.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.converter;
import com.google.common.base.Strings;
import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.AlgorithmDistSQLConverter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.AlgorithmDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
index 972184cf911..3e74c389a8e 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetriever.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilder.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilder.java
index 20cb4a60312..2aa6e014f9f 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilder.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
index 42c1e106185..c7eddb5f1a4 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
import com.google.common.base.Joiner;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.exportable.ExportableRuleAttribute;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
index b8f8f462842..a5c83e0aeed 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
index c250337b784..4d7f8e6fa7e 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java
index 5569b71e05f..b88f9d8701f 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutor.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.InvalidStorageUnitStatusException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutor.java
index 3c26b87023e..c4b0abaf560 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
index afd9d14a03d..ee91cd248fc 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
diff --git a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverterTest.java
index 7b13e0c7b9c..27734766a9e 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverterTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.util.props.PropertiesBuilder;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetrieverTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetrieverTest.java
index 95edbdf5695..34873c0eb45 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetrieverTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/InUsedReadwriteSplittingStorageUnitRetrieverTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilderTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilderTest.java
index 27c3a9029a5..575bac59e4b 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilderTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ReadwriteSplittingCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
index 613a583cfe3..10412f1cd1e 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java
index 1a4f5e830db..6e8341069b4 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutorTest.java
index 6576ccb943d..50efd7187f1 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingStorageUnitStatusExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.InvalidStorageUnitStatusException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java
index 3f82b0422cc..b202f013917 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
index 5c8cd103e04..e266035d722 100644
--- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
+++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
index e9221e57201..d75ca07cdfc 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverter.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.converter;
import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.AlgorithmDistSQLConverter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.AlgorithmDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
import org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
index 19f3f50c834..c41a2b0fed3 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetriever.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilder.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilder.java
index be9db2e95dd..954e68b21e1 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilder.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
index 48da3c51f95..48566aa1175 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
index 4fc6ba7a944..5077d3dc300 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowAlgorithmsStatement;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
index c6e5deabb05..dfbd387bea3 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
index 5f8831c596c..8d4dcf13ea5 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
index 79823ce0b72..447d02ceb47 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
index 17600e5c1b1..43c761bc60d 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
index 5d102b53f5f..a59ccb69c19 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java
index 1fd1e3ac42b..1a7b76a4d3f 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
index 200d2278189..534c9bbe505 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.external.sql.identifier.SQLExceptionIdentifier;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
index 189e605659d..1e603a26c3e 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
index f5855c9d630..bbc354fbe5c 100644
--- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
+++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
similarity index 100%
rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverterTest.java
index 625d1e98837..cfb6f472546 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverterTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.shadow.config.ShadowRuleConfiguration;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetrieverTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetrieverTest.java
index 67f81a7a15e..03a32caf133 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetrieverTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/InUsedShadowStorageUnitRetrieverTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.shadow.config.datasource.ShadowDataSourceConfiguration;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilderTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilderTest.java
index 1001a008b80..403cb579e37 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilderTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.attribute.datasource.DataSourceMapperRuleAttribute;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutorTest.java
index f7602cd1870..edbb97822aa 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
index be6f4e67da6..32e46641f69 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutorTest.java
index 396b0c400d5..ee6da3249d0 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutorTest.java
index 6adcdc68e80..0b091894784 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutorTest.java
index 9c2f01e9cac..b867b7db051 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
index d2b347910d3..b0562fef927 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
index d9c2db3aef9..97b066cd545 100644
--- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
+++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
index 7a98be58088..eec512a10bd 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverter.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.converter;
import com.google.common.base.Strings;
import org.apache.shardingsphere.distsql.handler.constant.DistSQLConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.AlgorithmDistSQLConverter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.AlgorithmDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
index 1c2fd893ac6..aefb2fa2fd1 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetriever.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.ShardingTable;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
index 08975fc1a91..f79314e16f1 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
index 59a20087a96..d4ce08c6677 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
index 56e90a1d6a6..aabc8b3e7da 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAlgorithmsStatement;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
index 1acdbfbb84e..905dcfeee35 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGenerateStrategiesExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGenerateStrategiesExecutor.java
index ee808d7b019..348916bbe50 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGenerateStrategiesExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGenerateStrategiesExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.KeyGenerateStrategiesConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
index eccee8eecb0..8792c0df01d 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
index 5bbad252e15..4245aa521dc 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
index b99aa5d2175..4b075352b28 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableReferenceRulesStatement;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
index de5a3f27092..a6892a85147 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
index be1c0d10b63..edea37e6ebb 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
index 4493368d77b..d669238e741 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAuditorStatement;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
index a15fa8eaab1..a715223520d 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
index c9975410a48..22c5db03c33 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.query;
import com.google.common.base.Strings;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
index 34f4838ef91..935615a7e9c 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
index 5e7b2009318..6707ebdc54a 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sharding.distsql.handler.update.UnusedAlgorithmFinder;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
index 6515f83f1f2..ef0bfc74083 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmDefinitionException;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGenerateStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGenerateStrategyExecutor.java
index 6785e4e16e8..c1092451b6f 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGenerateStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGenerateStrategyExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.config.keygen.KeyGenerateStrategiesConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorExecutor.java
index 72a94d9a826..0b87f015baf 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingKeyGeneratorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
index 08d1c1dcda2..e82ccfb1263 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
index a566864c4e4..1e6ae7525a1 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java
index f9b97d83799..7ec24b7cc14 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.InvalidAlgorithmDefinitionException;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGenerateStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGenerateStrategyExecutor.java
index aac23f4c004..fb1e7c0f8bc 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGenerateStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGenerateStrategyExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorExecutor.java
index 450aa7acf3e..0b2d9970c0c 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingKeyGeneratorExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.algorithm.keygen.spi.KeyGenerateAlgorithm;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java
index d0f9c518541..933865386e4 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.DuplicateRuleException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InvalidRuleConfigurationException;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutor.java
index c83619a4ec8..8deee568175 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
index e99e442e589..ad6f340d3c7 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
index e6e7effe7f3..da48cd7a2cb 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
index 8dccd181838..6eeb44ed2dd 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGenerateStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGenerateStrategyExecutor.java
index ef00d351626..c89af87b483 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGenerateStrategyExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGenerateStrategyExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
index c280090e3aa..c814459a0ab 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sharding.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.algorithm.core.exception.InUsedAlgorithmException;
import org.apache.shardingsphere.infra.algorithm.core.exception.UnregisteredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
index 607ab209cc7..c59445ab3a4 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceExecutor.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
index 6e26f3a4e11..e3f370ace70 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.sharding.distsql.handler.update;
import com.cedarsoftware.util.CaseInsensitiveSet;
import com.google.common.base.Splitter;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.InUsedRuleException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
similarity index 100%
rename from features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
rename to features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverterTest.java
index b8cae454ea8..719dd4c88aa 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverterTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetrieverTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetrieverTest.java
index fe763047ce4..c81af004592 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetrieverTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/InUsedShardingStorageUnitRetrieverTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilderTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilderTest.java
index a99a18287d7..88a9d9f386a 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilderTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShardingCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutorTest.java
index 50e775b6271..f209a59cefc 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutorTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.sharding.distsql.handler.query;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/DistSQLConnectionContext.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/context/DistSQLConnectionContext.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/DistSQLConnectionContext.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/context/DistSQLConnectionContext.java
index 918d7b20808..bcbd7211d00 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/DistSQLConnectionContext.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/context/DistSQLConnectionContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine;
+package org.apache.shardingsphere.distsql.handler.context;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtils.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtils.java
index 4768f45f89e..0c27bf51fad 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.util;
+package org.apache.shardingsphere.distsql.handler.engine.prepare;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetter.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetter.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetter.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetter.java
index 2039bfb5a4a..57ca980276a 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetter.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetter.java
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.aware;
+package org.apache.shardingsphere.distsql.handler.engine.prepare;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.NoDatabaseSelectedException;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.global.ShowGlobalRulesStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorRequiredChecker.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorRequiredChecker.java
index 8110bb7cad1..e1ab15ca8ba 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorRequiredChecker.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorRequiredChecker.java
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.required;
+package org.apache.shardingsphere.distsql.handler.engine.prepare;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.type.DropRuleStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
index 2b9297adb46..1a45832ab47 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.distsql.handler.engine.query;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorAwareSetter;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.util.DatabaseNameUtils;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DatabaseNameUtils;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DistSQLExecutorAwareSetter;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
index d94ea61892a..9948d960f8a 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
@@ -17,18 +17,18 @@
package org.apache.shardingsphere.distsql.handler.engine.update;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorAwareSetter;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecuteEngine;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.global.GlobalRuleDefinitionExecuteEngine;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.global.GlobalRuleDefinitionExecutorFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.AdvancedDistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequiredChecker;
-import org.apache.shardingsphere.distsql.handler.util.DatabaseNameUtils;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DatabaseNameUtils;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DistSQLExecutorAwareSetter;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DistSQLExecutorRequiredChecker;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecuteEngine;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.global.GlobalRuleDefinitionExecuteEngine;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.global.GlobalRuleDefinitionExecutorFactory;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.AdvancedDistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.RuleDefinitionStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngine.java
similarity index 89%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngine.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngine.java
index a6559c683b6..c27eb5b505c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngine.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequiredChecker;
+import org.apache.shardingsphere.distsql.handler.engine.prepare.DistSQLExecutorRequiredChecker;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecutorFactory.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecutorFactory.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecutorFactory.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecutorFactory.java
index 812ea471c4b..9142e8bf50f 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecutorFactory.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecutorFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperator.java
similarity index 98%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperator.java
index f63fd513b53..57a24c41188 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactory.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactory.java
similarity index 80%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactory.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactory.java
index 6bff7219f14..1db5a6d1cf7 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactory.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactory.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.AlterDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.CreateDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.DropDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.AlterDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.CreateDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.DropDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperator.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperator.java
index 55f6161d935..97f873d6eda 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperator.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/CreateDatabaseRuleOperator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/CreateDatabaseRuleOperator.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/CreateDatabaseRuleOperator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/CreateDatabaseRuleOperator.java
index 706b72f017e..5dee2a7b2e9 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/CreateDatabaseRuleOperator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/CreateDatabaseRuleOperator.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperator.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperator.java
index 49209601a34..75c3e76f0f2 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperator.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.aware.StaticDataSourceContainedRuleAwareStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecuteEngine.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecuteEngine.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecuteEngine.java
index 5b745258c96..58d2e2988ce 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecuteEngine.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.global;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.global;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.global.GlobalRuleDefinitionStatement;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecutorFactory.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecutorFactory.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecutorFactory.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecutorFactory.java
index 108416295bb..b6201902ebd 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/global/GlobalRuleDefinitionExecutorFactory.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/global/GlobalRuleDefinitionExecutorFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.global;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.global;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorConnectionContextAware.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorConnectionContextAware.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorConnectionContextAware.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorConnectionContextAware.java
index 8871e252d7a..2e2b716ff6f 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorConnectionContextAware.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorConnectionContextAware.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.aware;
+package org.apache.shardingsphere.distsql.handler.executor.aware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
/**
* DistSQL executor connection context aware.
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorDatabaseAware.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorDatabaseAware.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorDatabaseAware.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorDatabaseAware.java
index 7d0cbe29ef6..7a429a77dd2 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorDatabaseAware.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorDatabaseAware.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.aware;
+package org.apache.shardingsphere.distsql.handler.executor.aware;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorRuleAware.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorRuleAware.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorRuleAware.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorRuleAware.java
index 57b46b62939..88cbe65ef17 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorRuleAware.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/aware/DistSQLExecutorRuleAware.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.aware;
+package org.apache.shardingsphere.distsql.handler.executor.aware;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/computenode/SetComputeNodeStateExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/SetComputeNodeStateExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/computenode/SetComputeNodeStateExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/SetComputeNodeStateExecutor.java
index 5c372b4ff42..37a81e756cb 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/computenode/SetComputeNodeStateExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/SetComputeNodeStateExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.computenode;
+package org.apache.shardingsphere.distsql.handler.executor.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetComputeNodeStateStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeInfoExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeInfoExecutor.java
index 5348f14cb46..8f6e7af4c86 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeInfoExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeInfoExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode;
+package org.apache.shardingsphere.distsql.handler.executor.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodeInfoStatement;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeModeExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeModeExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeModeExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeModeExecutor.java
index e69348f2140..637fed61440 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodeModeExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodeModeExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode;
+package org.apache.shardingsphere.distsql.handler.executor.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodeModeStatement;
import org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodesExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodesExecutor.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodesExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodesExecutor.java
index 84955188850..0ae2fa63f3a 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/computenode/ShowComputeNodesExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/computenode/ShowComputeNodesExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode;
+package org.apache.shardingsphere.distsql.handler.executor.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodesStatement;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/AlgorithmDistSQLConverter.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/AlgorithmDistSQLConverter.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/AlgorithmDistSQLConverter.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/AlgorithmDistSQLConverter.java
index 1d62fee0194..f5db66ae05c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/AlgorithmDistSQLConverter.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/AlgorithmDistSQLConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.convert;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/ConvertYamlConfigurationExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/ConvertYamlConfigurationExecutor.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/ConvertYamlConfigurationExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/ConvertYamlConfigurationExecutor.java
index 7905e19c542..3e40ff4df46 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/ConvertYamlConfigurationExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/ConvertYamlConfigurationExecutor.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.convert;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.swapper.YamlDataSourceConfigurationSwapper;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.DistSQLScriptConstants;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.swapper.YamlDataSourceConfigurationSwapper;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.convert.ConvertYamlConfigurationStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/DistSQLScriptConstants.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/DistSQLScriptConstants.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/DistSQLScriptConstants.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/DistSQLScriptConstants.java
index e3d3854252f..0a4bdf656eb 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/DistSQLScriptConstants.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/DistSQLScriptConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.convert;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/spi/RuleConfigurationToDistSQLConverter.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/spi/RuleConfigurationToDistSQLConverter.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/spi/RuleConfigurationToDistSQLConverter.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/spi/RuleConfigurationToDistSQLConverter.java
index 6ed560d15e6..fb98aa083cc 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/yaml/convert/spi/RuleConfigurationToDistSQLConverter.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/convert/spi/RuleConfigurationToDistSQLConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ClusterExportMetaDataGenerator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ClusterExportMetaDataGenerator.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ClusterExportMetaDataGenerator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ClusterExportMetaDataGenerator.java
index bbbb877fe86..a8e1f48e8fd 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ClusterExportMetaDataGenerator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ClusterExportMetaDataGenerator.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.executor.export.spi.ExportedSnapshotInfoGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedClusterInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi.ExportedSnapshotInfoGenerator;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/DatabaseExportMetaDataGenerator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/DatabaseExportMetaDataGenerator.java
similarity index 98%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/DatabaseExportMetaDataGenerator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/DatabaseExportMetaDataGenerator.java
index 5a4b6d0a81d..3bfc669f844 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/DatabaseExportMetaDataGenerator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/DatabaseExportMetaDataGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportDatabaseConfigurationExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportDatabaseConfigurationExecutor.java
similarity index 85%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportDatabaseConfigurationExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportDatabaseConfigurationExecutor.java
index f497ffc72aa..0829526ef8f 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportDatabaseConfigurationExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportDatabaseConfigurationExecutor.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.export.DatabaseExportMetaDataGenerator;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportUtils;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.util.ExportUtils;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportDatabaseConfigurationStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportMetaDataExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportMetaDataExecutor.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportMetaDataExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportMetaDataExecutor.java
index a2d68cb8e2c..c26e0c3780c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportMetaDataExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportMetaDataExecutor.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export;
import org.apache.commons.codec.binary.Base64;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.export.ClusterExportMetaDataGenerator;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportUtils;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.util.ExportUtils;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportMetaDataStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportStorageNodesExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportStorageNodesExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportStorageNodesExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportStorageNodesExecutor.java
index bb936f4bef0..3a89039c37c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ExportStorageNodesExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/ExportStorageNodesExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export;
import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportUtils;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedStorageNode;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedStorageNodes;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedStorageNode;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedStorageNodes;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.util.ExportUtils;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportStorageNodesStatement;
import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedClusterInfo.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedClusterInfo.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedClusterInfo.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedClusterInfo.java
index a581b744729..db43d5aaeee 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedClusterInfo.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedClusterInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedMetaData.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedMetaData.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedMetaData.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedMetaData.java
index d71193ca694..c0877840eca 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedMetaData.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.model;
import lombok.Getter;
import lombok.Setter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedSnapshotInfo.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedSnapshotInfo.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedSnapshotInfo.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedSnapshotInfo.java
index 5b5db15d179..7fcb5d983a1 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedSnapshotInfo.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedSnapshotInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNode.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNode.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNode.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNode.java
index 50783e1d589..43ba8d78893 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNode.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNodes.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNodes.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNodes.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNodes.java
index 266133367bf..769ee3158e3 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportedStorageNodes.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/model/ExportedStorageNodes.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/spi/ExportedSnapshotInfoGenerator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/spi/ExportedSnapshotInfoGenerator.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/spi/ExportedSnapshotInfoGenerator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/spi/ExportedSnapshotInfoGenerator.java
index 3da48dc072a..bb926eb49e4 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/spi/ExportedSnapshotInfoGenerator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/export/spi/ExportedSnapshotInfoGenerator.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export.spi;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedSnapshotInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedSnapshotInfo;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.spi.ShardingSphereSPI;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportDatabaseConfigurationExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportDatabaseConfigurationExecutor.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportDatabaseConfigurationExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportDatabaseConfigurationExecutor.java
index b0893896be5..578768e04f9 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportDatabaseConfigurationExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportDatabaseConfigurationExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.imports;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.infra.exception.generic.FileIOException;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportMetaDataExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportMetaDataExecutor.java
similarity index 87%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportMetaDataExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportMetaDataExecutor.java
index 6691dcdae15..80710c9f86e 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/ImportMetaDataExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/ImportMetaDataExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.imports;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedClusterInfo;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedClusterInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportMetaDataStatement;
import org.apache.shardingsphere.infra.exception.generic.FileIOException;
import org.apache.shardingsphere.infra.util.json.JsonEngine;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/MetaDataImportExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/MetaDataImportExecutor.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/MetaDataImportExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/MetaDataImportExecutor.java
index ce8346c03ab..9f268725ff6 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/MetaDataImportExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/MetaDataImportExecutor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.imports;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlExportedServerConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlExportedServerConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/YamlDatabaseConfigurationImportExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/YamlDatabaseConfigurationImportExecutor.java
similarity index 97%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/YamlDatabaseConfigurationImportExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/YamlDatabaseConfigurationImportExecutor.java
index c0bd69bd569..d08d69b63a0 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/imports/YamlDatabaseConfigurationImportExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/imports/YamlDatabaseConfigurationImportExecutor.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.imports;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.DatabaseCreateExistsException;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.swapper.YamlDataSourceConfigurationSwapper;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.swapper.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDataSourceConfiguration.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDataSourceConfiguration.java
similarity index 99%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDataSourceConfiguration.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDataSourceConfiguration.java
index 97c2a249c1d..7daf03dca0e 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDataSourceConfiguration.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDataSourceConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml;
import lombok.Getter;
import lombok.Setter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfiguration.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfiguration.java
similarity index 99%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfiguration.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfiguration.java
index 8f562b3bbca..bff49c4f94b 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfiguration.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml;
import lombok.Getter;
import lombok.Setter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlExportedServerConfiguration.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlExportedServerConfiguration.java
similarity index 99%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlExportedServerConfiguration.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlExportedServerConfiguration.java
index 07c401b16cd..6a5c501deea 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlExportedServerConfiguration.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlExportedServerConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml;
import lombok.Getter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapper.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapper.java
similarity index 97%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapper.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapper.java
index a50f33fd12e..ba4c73c51d0 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapper.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml.swapper;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.swapper;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.ConnectionConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.PoolConfiguration;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutor.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutor.java
index de798712662..7dff8b4162d 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock;
+package org.apache.shardingsphere.distsql.handler.executor.lock;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LockClusterStatement;
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterOperation.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterOperation.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterOperation.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterOperation.java
index 6580e72db8b..a4a16401945 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterOperation.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterOperation.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock;
+package org.apache.shardingsphere.distsql.handler.executor.lock;
import org.apache.shardingsphere.mode.exclusive.ExclusiveOperation;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/UnlockClusterExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/UnlockClusterExecutor.java
similarity index 89%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/UnlockClusterExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/UnlockClusterExecutor.java
index 1c90e24b4a8..a03714d5019 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/UnlockClusterExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/lock/UnlockClusterExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock;
+package org.apache.shardingsphere.distsql.handler.executor.lock;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshDatabaseMetaDataExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshDatabaseMetaDataExecutor.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshDatabaseMetaDataExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshDatabaseMetaDataExecutor.java
index 62556152c83..0d8a9c7be7e 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshDatabaseMetaDataExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshDatabaseMetaDataExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh;
+package org.apache.shardingsphere.distsql.handler.executor.metadata;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshDatabaseMetaDataStatement;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshTableMetaDataExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshTableMetaDataExecutor.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshTableMetaDataExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshTableMetaDataExecutor.java
index e3560650de3..56bd68af816 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/refresh/RefreshTableMetaDataExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/RefreshTableMetaDataExecutor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh;
+package org.apache.shardingsphere.distsql.handler.executor.metadata;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.SchemaNotFoundException;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ShowTableMetaDataExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/ShowTableMetaDataExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ShowTableMetaDataExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/ShowTableMetaDataExecutor.java
index 50096d0af30..96f56d3b7bd 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/export/ShowTableMetaDataExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/metadata/ShowTableMetaDataExecutor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export;
+package org.apache.shardingsphere.distsql.handler.executor.metadata;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowTableMetaDataStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRow.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRow.java
similarity index 97%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRow.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRow.java
index 49554a6ddd4..c9c2f072415 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRow.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRow.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.plugin;
+package org.apache.shardingsphere.distsql.handler.executor.plugin;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseSupportedTypedSPI;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutor.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutor.java
index 5430263c3ae..9098b3fcbbf 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.plugin;
+package org.apache.shardingsphere.distsql.handler.executor.plugin;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseSupportedTypedSPI;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowPluginsStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.generic.PluginNotFoundException;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/PreviewExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/PreviewExecutor.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/PreviewExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/PreviewExecutor.java
index bb364214be5..2399d5adaad 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/PreviewExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/PreviewExecutor.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rul;
+package org.apache.shardingsphere.distsql.handler.executor.preview;
import com.google.common.base.Preconditions;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.rul.spi.PreviewExecutionUnitGenerator;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.preview.spi.PreviewExecutionUnitGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rul.sql.PreviewStatement;
import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.context.statement.type.ddl.CursorHeldSQLStatementContext;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/spi/PreviewExecutionUnitGenerator.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/spi/PreviewExecutionUnitGenerator.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/spi/PreviewExecutionUnitGenerator.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/spi/PreviewExecutionUnitGenerator.java
index 4222d44f4ab..38fdadac085 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rul/spi/PreviewExecutionUnitGenerator.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/preview/spi/PreviewExecutionUnitGenerator.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rul.spi;
+package org.apache.shardingsphere.distsql.handler.executor.preview.spi;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.session.query.QueryContext;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorClusterModeRequired.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorClusterModeRequired.java
similarity index 94%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorClusterModeRequired.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorClusterModeRequired.java
index a55f7f6e6c8..803a2b8b412 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorClusterModeRequired.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorClusterModeRequired.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.required;
+package org.apache.shardingsphere.distsql.handler.executor.required;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorCurrentRuleRequired.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorCurrentRuleRequired.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorCurrentRuleRequired.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorCurrentRuleRequired.java
index 637686a1195..049e8adfc56 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/required/DistSQLExecutorCurrentRuleRequired.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/required/DistSQLExecutorCurrentRuleRequired.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.required;
+package org.apache.shardingsphere.distsql.handler.executor.required;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutor.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutor.java
index 672400e3f3f..15dde4be9e8 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.checker.PrivilegeCheckType;
@@ -23,8 +23,8 @@ import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.Connecti
import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionPropertiesParser;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutor.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutor.java
index 5daa410d25d..db76bea9b25 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.checker.PrivilegeCheckType;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutor.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutor.java
index 43b9189dff8..bd09b24315c 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rql.resource.ShowLogicalTablesStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutor.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutor.java
index 9af4bc7e3ea..97cbf51c7c1 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import com.google.common.base.CaseFormat;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutor.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutor.java
index be19362e9ab..76d61c4fd2f 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rql.resource.ShowStorageUnitsStatement;
import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource;
import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutor.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutor.java
index d3cfffd6962..00e138d447b 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.resource.unit.type.UnregisterStorageUnitStatement;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.external.server.ShardingSphereServerException;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/spi/InUsedStorageUnitRetriever.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/spi/InUsedStorageUnitRetriever.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/spi/InUsedStorageUnitRetriever.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/spi/InUsedStorageUnitRetriever.java
index 2ac09f451c8..e9b8f8cbcba 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/spi/InUsedStorageUnitRetriever.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/resource/spi/InUsedStorageUnitRetriever.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi;
+package org.apache.shardingsphere.distsql.handler.executor.resource.spi;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/RuleCountExecutor.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/RuleCountExecutor.java
index 02ccfe93cbd..e0252761371 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/RuleCountExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.rule;
+package org.apache.shardingsphere.distsql.handler.executor.rule;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.CountRuleStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/spi/CountResultRowBuilder.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/spi/CountResultRowBuilder.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/spi/CountResultRowBuilder.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/spi/CountResultRowBuilder.java
index 01908f99030..fec958d4cf6 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/spi/CountResultRowBuilder.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rule/spi/CountResultRowBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi;
+package org.apache.shardingsphere.distsql.handler.executor.rule.spi;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/spi/DistSQLQueryExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/query/DistSQLQueryExecutor.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/spi/DistSQLQueryExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/query/DistSQLQueryExecutor.java
index 974eb1d8789..6c8de148835 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/spi/DistSQLQueryExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/query/DistSQLQueryExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.spi;
+package org.apache.shardingsphere.distsql.handler.executor.spi.query;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/AdvancedDistSQLUpdateExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/AdvancedDistSQLUpdateExecutor.java
similarity index 93%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/AdvancedDistSQLUpdateExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/AdvancedDistSQLUpdateExecutor.java
index 6fe9fe55317..e9dea943438 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/AdvancedDistSQLUpdateExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/AdvancedDistSQLUpdateExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.spi;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/DistSQLUpdateExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/DistSQLUpdateExecutor.java
similarity index 95%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/DistSQLUpdateExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/DistSQLUpdateExecutor.java
index 7e1c35dd558..7176ae74efc 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/spi/DistSQLUpdateExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/DistSQLUpdateExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.spi;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/DatabaseRuleDefinitionExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/DatabaseRuleDefinitionExecutor.java
similarity index 84%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/DatabaseRuleDefinitionExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/DatabaseRuleDefinitionExecutor.java
index 5673f7974ed..a36563a79ed 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/DatabaseRuleDefinitionExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/DatabaseRuleDefinitionExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleAlterExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleAlterExecutor.java
similarity index 89%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleAlterExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleAlterExecutor.java
index f961e309b68..17e4cc371fc 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleAlterExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleAlterExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleCreateExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleCreateExecutor.java
similarity index 88%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleCreateExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleCreateExecutor.java
index b758a55a560..4ebf04c6b83 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleCreateExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleCreateExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutor.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutor.java
index 990bf7dd374..4b7083daefd 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/global/GlobalRuleDefinitionExecutor.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/global/GlobalRuleDefinitionExecutor.java
index e113317050c..1e0a8641d76 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/global/GlobalRuleDefinitionExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/global/GlobalRuleDefinitionExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.global.GlobalRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/common/DistSQLVariable.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/DistSQLVariable.java
similarity index 92%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/common/DistSQLVariable.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/DistSQLVariable.java
index d36a1bf930f..ec23552ada4 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/common/DistSQLVariable.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/DistSQLVariable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.common;
+package org.apache.shardingsphere.distsql.handler.executor.variable;
/**
* DistSQL variable.
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/variable/SetDistVariableExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/SetDistVariableExecutor.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/variable/SetDistVariableExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/SetDistVariableExecutor.java
index c0c5828fc29..3cc1fb27ae5 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/variable/SetDistVariableExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/SetDistVariableExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.variable;
+package org.apache.shardingsphere.distsql.handler.executor.variable;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariableExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariableExecutor.java
similarity index 91%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariableExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariableExecutor.java
index 8eea32669e5..559ce77e94e 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariableExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariableExecutor.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable;
+package org.apache.shardingsphere.distsql.handler.executor.variable;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.common.DistSQLVariable;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowDistVariableStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariablesExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariablesExecutor.java
similarity index 90%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariablesExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariablesExecutor.java
index e9467b2e688..5c3af855014 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/queryable/variable/ShowDistVariablesExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/variable/ShowDistVariablesExecutor.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable;
+package org.apache.shardingsphere.distsql.handler.executor.variable;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.common.DistSQLVariable;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowDistVariablesStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportUtils.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/ExportUtils.java
similarity index 96%
rename from infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportUtils.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/ExportUtils.java
index 60ab7c1d802..fe3f2519399 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/export/ExportUtils.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/ExportUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.export;
+package org.apache.shardingsphere.distsql.handler.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
deleted file mode 100644
index b3753f4d0d2..00000000000
--- a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowRulesUsedStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.executor.rql.resource.ShowLogicalTablesExecutor
-org.apache.shardingsphere.distsql.handler.executor.rql.rule.RuleCountExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.plugin.ShowPluginsExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodesExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodeInfoExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodeModeExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportDatabaseConfigurationExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportMetaDataExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportStorageNodesExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.ConvertYamlConfigurationExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable.ShowDistVariableExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable.ShowDistVariablesExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ShowTableMetaDataExecutor
-org.apache.shardingsphere.distsql.handler.executor.rul.PreviewExecutor
diff --git a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
deleted file mode 100644
index 94617fe7c63..00000000000
--- a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shardingsphere.distsql.handler.executor.rdl.resource.RegisterStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.executor.rdl.resource.AlterStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.executor.rdl.resource.UnregisterStorageUnitExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.computenode.SetComputeNodeStateExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportDatabaseConfigurationExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportMetaDataExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.variable.SetDistVariableExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshDatabaseMetaDataExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.LockClusterExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.UnlockClusterExecutor
-org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshTableMetaDataExecutor
diff --git a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
new file mode 100644
index 00000000000..d7565e69601
--- /dev/null
+++ b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+
+org.apache.shardingsphere.distsql.handler.executor.resource.ShowStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.resource.ShowRulesUsedStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.resource.ShowLogicalTablesExecutor
+org.apache.shardingsphere.distsql.handler.executor.rule.RuleCountExecutor
+org.apache.shardingsphere.distsql.handler.executor.plugin.ShowPluginsExecutor
+org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodesExecutor
+org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodeInfoExecutor
+org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodeModeExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportDatabaseConfigurationExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportMetaDataExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportStorageNodesExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.convert.ConvertYamlConfigurationExecutor
+org.apache.shardingsphere.distsql.handler.executor.variable.ShowDistVariableExecutor
+org.apache.shardingsphere.distsql.handler.executor.variable.ShowDistVariablesExecutor
+org.apache.shardingsphere.distsql.handler.executor.metadata.ShowTableMetaDataExecutor
+org.apache.shardingsphere.distsql.handler.executor.preview.PreviewExecutor
diff --git a/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
new file mode 100644
index 00000000000..23f97d0a577
--- /dev/null
+++ b/infra/distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+org.apache.shardingsphere.distsql.handler.executor.resource.RegisterStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.resource.AlterStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.resource.UnregisterStorageUnitExecutor
+org.apache.shardingsphere.distsql.handler.executor.computenode.SetComputeNodeStateExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportDatabaseConfigurationExecutor
+org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportMetaDataExecutor
+org.apache.shardingsphere.distsql.handler.executor.variable.SetDistVariableExecutor
+org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshDatabaseMetaDataExecutor
+org.apache.shardingsphere.distsql.handler.executor.lock.LockClusterExecutor
+org.apache.shardingsphere.distsql.handler.executor.lock.UnlockClusterExecutor
+org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshTableMetaDataExecutor
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/DistSQLExecutorConcurrentIsolationTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/DistSQLExecutorConcurrentIsolationTest.java
index d2c4d5a9303..f50945c6a71 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/DistSQLExecutorConcurrentIsolationTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/DistSQLExecutorConcurrentIsolationTest.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.distsql.handler.engine.concurrent;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
import org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture.FixtureDatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture.FixtureDistSQLQueryStatement;
import org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture.FixtureDistSQLUpdateStatement;
import org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture.FixtureRule;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDatabaseRuleDefinitionExecutor.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDatabaseRuleDefinitionExecutor.java
index 573a767f823..6695db18be9 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDatabaseRuleDefinitionExecutor.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDatabaseRuleDefinitionExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLQueryExecutor.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLQueryExecutor.java
index fb705e5514a..f2cddad4efd 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLQueryExecutor.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLQueryExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLUpdateExecutor.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLUpdateExecutor.java
index 8aaa8f1f1bb..f1c58859811 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLUpdateExecutor.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/concurrent/fixture/FixtureDistSQLUpdateExecutor.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.distsql.handler.engine.concurrent.fixture;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtilsTest.java
similarity index 97%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtilsTest.java
index 0bb000e4297..cea96f5c6a1 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DatabaseNameUtilsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.util;
+package org.apache.shardingsphere.distsql.handler.engine.prepare;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetterTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetterTest.java
similarity index 95%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetterTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetterTest.java
index f44619fd316..159ef3dc9f6 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/aware/DistSQLExecutorAwareSetterTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/prepare/DistSQLExecutorAwareSetterTest.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.aware;
+package org.apache.shardingsphere.distsql.handler.engine.prepare;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.NoDatabaseSelectedException;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.global.ShowGlobalRulesStatement;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngineTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngineTest.java
index bcc7db5a712..d6d5aa7b26a 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngineTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngineTest.java
@@ -17,16 +17,16 @@
package org.apache.shardingsphere.distsql.handler.engine.update;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleOperatorFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.global.GlobalRuleDefinitionExecutorFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.AdvancedDistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleOperatorFactory;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.global.GlobalRuleDefinitionExecutorFactory;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.AdvancedDistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LockClusterStatement;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java
similarity index 96%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java
index 5870e935f12..0595653d97f 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleDefinitionExecuteEngineTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactoryTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactoryTest.java
similarity index 83%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactoryTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactoryTest.java
index 5328bf44b83..d1ba50e5136 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/DatabaseRuleOperatorFactoryTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/DatabaseRuleOperatorFactoryTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.AlterDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.CreateDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type.DropDatabaseRuleOperator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.AlterDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.CreateDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator.DropDatabaseRuleOperator;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.junit.jupiter.api.Test;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperatorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperatorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperatorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperatorTest.java
index e0eff51a8ed..3f846c8d753 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/AlterDatabaseRuleOperatorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/AlterDatabaseRuleOperatorTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.config.rule.checker.DatabaseRuleConfigurationEmptyChecker;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperatorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperatorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperatorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperatorTest.java
index 99275df6fb3..30431c01ede 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/database/type/DropDatabaseRuleOperatorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rule/database/operator/DropDatabaseRuleOperatorTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.type;
+package org.apache.shardingsphere.distsql.handler.engine.update.rule.database.operator;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleDropExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleDropExecutor;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.aware.StaticDataSourceContainedRuleAwareStatement;
import org.apache.shardingsphere.distsql.statement.type.rdl.rule.database.DatabaseRuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfigurationTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfigurationTest.java
similarity index 99%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfigurationTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfigurationTest.java
index 06d150f2afb..599964203fd 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/YamlDatabaseConfigurationTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/YamlDatabaseConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.junit.jupiter.api.Test;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java
index a2559e0f027..791ef9ade40 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/config/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/configuration/yaml/swapper/YamlDataSourceConfigurationSwapperTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.config.yaml.swapper;
+package org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.swapper;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.ConnectionConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.config.PoolConfiguration;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutorTest.java
similarity index 97%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutorTest.java
index 44380d31f19..79c8c35eddf 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/updatable/lock/LockClusterExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/lock/LockClusterExecutorTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock;
+package org.apache.shardingsphere.distsql.handler.executor.lock;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.LockClusterStatement;
import org.apache.shardingsphere.infra.algorithm.core.exception.MissingRequiredAlgorithmException;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRowTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRowTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRowTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRowTest.java
index ddd7dfde455..0b59762d8ba 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/PluginMetaDataQueryResultRowTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/PluginMetaDataQueryResultRowTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.plugin;
+package org.apache.shardingsphere.distsql.handler.executor.plugin;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseSupportedTypedSPI;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutorTest.java
index 2353aef3444..a7d2b8609d9 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/plugin/ShowPluginsExecutorTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.ral.plugin;
+package org.apache.shardingsphere.distsql.handler.executor.plugin;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseSupportedTypedSPI;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowPluginsStatement;
import org.apache.shardingsphere.infra.exception.generic.PluginNotFoundException;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutorTest.java
index 1cf8048e979..5720eb1a46a 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/AlterStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/AlterStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import org.apache.shardingsphere.database.connector.core.jdbcurl.parser.ConnectionProperties;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutorTest.java
index cda2ad1749e..b5bfa407c09 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/RegisterStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/RegisterStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutorTest.java
index 46a26f2c9af..e4f38d19f52 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTablesExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowLogicalTablesExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import org.apache.shardingsphere.database.connector.core.metadata.database.enums.TableType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutorTest.java
index d6ebbf433ce..4b8d2f848b2 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowRulesUsedStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import org.apache.shardingsphere.distsql.handler.fixture.DistSQLHandlerFixtureRule;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutorTest.java
similarity index 98%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutorTest.java
index e60f8ed2c96..8a2056579f6 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/ShowStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rql.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import com.google.common.collect.ImmutableMap;
import org.apache.shardingsphere.distsql.statement.type.rql.resource.ShowStorageUnitsStatement;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutorTest.java
similarity index 99%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutorTest.java
index dd7608e0919..b64dd878161 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/UnregisterStorageUnitExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.executor.rdl.resource;
+package org.apache.shardingsphere.distsql.handler.executor.resource;
import com.google.common.collect.ImmutableMap;
import org.apache.shardingsphere.distsql.handler.fixture.DistSQLHandlerFixtureRule;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/fixture/FixtureInUsedStorageUnitRetriever.java
similarity index 89%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/fixture/FixtureInUsedStorageUnitRetriever.java
index 57099a582ed..d45f8a0bf11 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/query/rql/fixture/FixtureInUsedStorageUnitRetriever.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/resource/fixture/FixtureInUsedStorageUnitRetriever.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.query.rql.fixture;
+package org.apache.shardingsphere.distsql.handler.executor.resource.fixture;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.handler.fixture.DistSQLHandlerFixtureRule;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutorTest.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutorTest.java
similarity index 95%
rename from infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutorTest.java
rename to infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutorTest.java
index b79e5081b8d..aa9294f2934 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/spi/database/type/DatabaseRuleDropExecutorTest.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/executor/spi/update/rule/database/type/DatabaseRuleDropExecutorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type;
+package org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
diff --git a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
similarity index 88%
rename from features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
index 4c69e312b9c..350ffbf4c28 100644
--- a/features/broadcast/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
+++ b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.broadcast.distsql.handler.query.BroadcastCountResultRowBuilder
+org.apache.shardingsphere.distsql.handler.executor.resource.fixture.FixtureInUsedStorageUnitRetriever
diff --git a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
deleted file mode 100644
index 098510cba97..00000000000
--- a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shardingsphere.distsql.handler.engine.query.rql.fixture.FixtureInUsedStorageUnitRetriever
diff --git a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
similarity index 100%
rename from infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
rename to infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
diff --git a/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to infra/distsql-handler/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index 6d5dcc8c972..94fbabdb876 100644
--- a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++ b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -1118,7 +1118,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.broadcast.distsql.handler.update.CreateBroadcastTableRuleExecutor",
"methods": [
@@ -1130,7 +1130,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.broadcast.distsql.handler.update.DropBroadcastTableRuleExecutor",
"methods": [
@@ -1850,7 +1850,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.rdl.resource.AlterStorageUnitExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.resource.AlterStorageUnitExecutor",
"methods": [
{
"name": "<init>",
@@ -1862,7 +1862,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.rdl.resource.RegisterStorageUnitExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.resource.RegisterStorageUnitExecutor",
"methods": [
{
"name": "<init>",
@@ -1874,7 +1874,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.rdl.resource.UnregisterStorageUnitExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.resource.UnregisterStorageUnitExecutor",
"methods": [
{
"name": "<init>",
@@ -2190,7 +2190,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.encrypt.distsql.handler.update.AlterEncryptRuleExecutor",
"methods": [
@@ -2202,7 +2202,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.encrypt.distsql.handler.update.CreateEncryptRuleExecutor",
"methods": [
@@ -2214,7 +2214,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.encrypt.distsql.handler.update.DropEncryptRuleExecutor",
"methods": [
@@ -3349,7 +3349,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.mask.distsql.handler.update.AlterMaskRuleExecutor",
"methods": [
@@ -3361,7 +3361,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.mask.distsql.handler.update.CreateMaskRuleExecutor",
"methods": [
@@ -3373,7 +3373,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.mask.distsql.handler.update.DropMaskRuleExecutor",
"methods": [
@@ -4119,7 +4119,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.computenode.SetComputeNodeStateExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.computenode.SetComputeNodeStateExecutor",
"methods": [
{
"name": "<init>",
@@ -4131,7 +4131,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportDatabaseConfigurationExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportDatabaseConfigurationExecutor",
"methods": [
{
"name": "<init>",
@@ -4143,7 +4143,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportMetaDataExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportMetaDataExecutor",
"methods": [
{
"name": "<init>",
@@ -4155,7 +4155,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.LockClusterExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.lock.LockClusterExecutor",
"methods": [
{
"name": "<init>",
@@ -4167,7 +4167,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.UnlockClusterExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.lock.UnlockClusterExecutor",
"methods": [
{
"name": "<init>",
@@ -4179,7 +4179,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshDatabaseMetaDataExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshDatabaseMetaDataExecutor",
"methods": [
{
"name": "<init>",
@@ -4191,7 +4191,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshTableMetaDataExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshTableMetaDataExecutor",
"methods": [
{
"name": "<init>",
@@ -4203,7 +4203,7 @@
"condition": {
"typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine"
},
- "type": "org.apache.shardingsphere.distsql.handler.executor.ral.updatable.variable.SetDistVariableExecutor",
+ "type": "org.apache.shardingsphere.distsql.handler.executor.variable.SetDistVariableExecutor",
"methods": [
{
"name": "<init>",
@@ -4535,7 +4535,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.readwritesplitting.distsql.handler.update.AlterReadwriteSplittingRuleExecutor",
"methods": [
@@ -4559,7 +4559,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.readwritesplitting.distsql.handler.update.CreateReadwriteSplittingRuleExecutor",
"methods": [
@@ -4571,7 +4571,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.readwritesplitting.distsql.handler.update.DropReadwriteSplittingRuleExecutor",
"methods": [
@@ -4875,7 +4875,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.AlterDefaultShadowAlgorithmExecutor",
"methods": [
@@ -4887,7 +4887,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.AlterShadowRuleExecutor",
"methods": [
@@ -4899,7 +4899,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.CreateDefaultShadowAlgorithmExecutor",
"methods": [
@@ -4911,7 +4911,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.CreateShadowRuleExecutor",
"methods": [
@@ -4923,7 +4923,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.DropDefaultShadowAlgorithmExecutor",
"methods": [
@@ -4935,7 +4935,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.DropShadowAlgorithmExecutor",
"methods": [
@@ -4947,7 +4947,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.shadow.distsql.handler.update.DropShadowRuleExecutor",
"methods": [
@@ -5650,7 +5650,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.AlterDefaultShardingStrategyExecutor",
"methods": [
@@ -5662,7 +5662,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingKeyGenerateStrategyExecutor",
"methods": [
@@ -5674,7 +5674,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingKeyGeneratorExecutor",
"methods": [
@@ -5686,7 +5686,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingTableReferenceRuleExecutor",
"methods": [
@@ -5698,7 +5698,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingTableRuleExecutor",
"methods": [
@@ -5710,7 +5710,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.CreateDefaultShardingStrategyExecutor",
"methods": [
@@ -5722,7 +5722,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingKeyGenerateStrategyExecutor",
"methods": [
@@ -5734,7 +5734,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingKeyGeneratorExecutor",
"methods": [
@@ -5746,7 +5746,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableReferenceRuleExecutor",
"methods": [
@@ -5758,7 +5758,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableRuleExecutor",
"methods": [
@@ -5770,7 +5770,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropDefaultShardingStrategyExecutor",
"methods": [
@@ -5782,7 +5782,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingAlgorithmExecutor",
"methods": [
@@ -5794,7 +5794,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingAuditorExecutor",
"methods": [
@@ -5806,7 +5806,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingKeyGenerateStrategyExecutor",
"methods": [
@@ -5818,7 +5818,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingKeyGeneratorExecutor",
"methods": [
@@ -5830,7 +5830,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingTableReferenceExecutor",
"methods": [
@@ -5842,7 +5842,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingTableRuleExecutor",
"methods": [
@@ -6281,7 +6281,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.single.distsql.handler.update.LoadSingleTableExecutor",
"methods": [
@@ -6293,7 +6293,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.single.distsql.handler.update.SetDefaultSingleTableStorageUnitExecutor",
"methods": [
@@ -6305,7 +6305,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.database.DatabaseRuleDefinitionExecutorFactory"
+ "typeReached": "org.apache.shardingsphere.distsql.handler.engine.update.rule.database.DatabaseRuleDefinitionExecutorFactory"
},
"type": "org.apache.shardingsphere.single.distsql.handler.update.UnloadSingleTableExecutor",
"methods": [
@@ -8017,19 +8017,19 @@
"condition": {
"typeReached": "org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
},
- "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.AdvancedDistSQLUpdateExecutor"
+ "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.AdvancedDistSQLUpdateExecutor"
},
{
"condition": {
"typeReached": "org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
},
- "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor"
+ "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor"
},
{
"condition": {
"typeReached": "org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
},
- "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor"
+ "glob": "META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor"
},
{
"condition": {
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutor.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutor.java
index 560747d06ae..4548a20c34b 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutor.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.driver.jdbc.core.statement;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
diff --git a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutorTest.java b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutorTest.java
index b9b61e965a1..3c0bc503798 100644
--- a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutorTest.java
+++ b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/DistSQLStatementExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.driver.jdbc.core.statement;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
diff --git a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
index 7e725b60016..4e88be13aa2 100644
--- a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
+++ b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.authority.distsql.handler.query;
import lombok.Setter;
import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/authority/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/authority/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/authority/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/authority/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutor.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutor.java
index 48e051d8c4c..bca16e3c6d2 100644
--- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutor.java
+++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutor.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.progress.config.Pipeline
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
import org.apache.shardingsphere.data.pipeline.core.metadata.PipelineProcessConfigurationPersistService;
import org.apache.shardingsphere.data.pipeline.distsql.statement.updatable.AlterTransmissionRuleStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.distsql.segment.ReadOrWriteSegment;
import org.apache.shardingsphere.distsql.segment.TransmissionRuleSegment;
diff --git a/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
similarity index 100%
rename from kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
rename to kernel/data-pipeline/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutorTest.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutorTest.java
index fdb6f7919b2..47586acc170 100644
--- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutorTest.java
+++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/distsql/handler/transmission/update/AlterTransmissionRuleExecutorTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.progress.config.Pipeline
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
import org.apache.shardingsphere.data.pipeline.core.metadata.PipelineProcessConfigurationPersistService;
import org.apache.shardingsphere.data.pipeline.distsql.statement.updatable.AlterTransmissionRuleStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.distsql.segment.ReadOrWriteSegment;
import org.apache.shardingsphere.distsql.segment.TransmissionRuleSegment;
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
index f1862277caf..b51a7448140 100644
--- a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
+++ b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.cdc.distsql.statement.queryable.S
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
import org.apache.shardingsphere.data.pipeline.core.job.progress.TransmissionJobItemProgress;
import org.apache.shardingsphere.data.pipeline.core.pojo.TransmissionJobItemInfo;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
index 4e62cfac39d..44c17e66fd7 100644
--- a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
+++ b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.cdc.CDCJobType;
import org.apache.shardingsphere.data.pipeline.cdc.distsql.statement.queryable.ShowStreamingListStatement;
import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey;
import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobManager;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
index 5c0325d66ca..f3494c145fc 100644
--- a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
+++ b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.data.pipeline.cdc.distsql.handler.query;
import org.apache.shardingsphere.data.pipeline.cdc.distsql.statement.queryable.ShowStreamingRuleStatement;
import org.apache.shardingsphere.data.pipeline.distsql.handler.transmission.query.ShowTransmissionRuleQueryResult;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/update/DropStreamingExecutor.java b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/update/DropStreamingExecutor.java
index 364467f7057..40077473ebe 100644
--- a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/update/DropStreamingExecutor.java
+++ b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/update/DropStreamingExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.cdc.distsql.handler.update;
import org.apache.shardingsphere.data.pipeline.cdc.api.CDCJobAPI;
import org.apache.shardingsphere.data.pipeline.cdc.distsql.statement.updatable.DropStreamingStatement;
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
similarity index 100%
rename from kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
rename to kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
index dc6f2b14173..bc2dfe7ca30 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.core.consistencycheck.pojo.Consis
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.ConsistencyCheckJobType;
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.ConsistencyCheckJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.queryable.ShowMigrationCheckStatusStatement;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
index e1c6d951c32..d31d2d0704e 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.TransmissionJobM
import org.apache.shardingsphere.data.pipeline.core.pojo.TransmissionJobItemInfo;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.queryable.ShowMigrationStatusStatement;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
index 36bdc564195..2724e92c7c9 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobManag
import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobInfo;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.queryable.ShowMigrationListStatement;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.ShardingInfo;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationRuleExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationRuleExecutor.java
index 8f84cad9c3d..d8bb9f56601 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationRuleExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationRuleExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.distsql.handler.transmission.query.ShowTransmissionRuleQueryResult;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.queryable.ShowMigrationRuleStatement;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
index 0768b9f54cc..8e885a40230 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey;
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.api.MigrationJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.queryable.ShowMigrationSourceStorageUnitsStatement;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CheckMigrationJobExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CheckMigrationJobExecutor.java
index 60c65bf1807..67c51c3a927 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CheckMigrationJobExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CheckMigrationJobExecutor.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.Cre
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.CheckMigrationStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CommitMigrationExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CommitMigrationExecutor.java
index 1fb27c4eeb1..c0942b73cce 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CommitMigrationExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/CommitMigrationExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.CommitMigrationStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/DropMigrationCheckExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/DropMigrationCheckExecutor.java
index 592f8edfc95..005034cd34f 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/DropMigrationCheckExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/DropMigrationCheckExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.ConsistencyCheckJobType;
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.ConsistencyCheckJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.DropMigrationCheckStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
index fea305417ed..2c8ef5dbae7 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
@@ -31,9 +31,9 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statem
import org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierNormalizeEngine;
import org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitExecutor.java
index 7b646752a5c..8dd615b0495 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitExecutor.java
@@ -23,8 +23,8 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.api.MigrationJ
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.RegisterMigrationSourceStorageUnitStatement;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorClusterModeRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.distsql.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RollbackMigrationExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RollbackMigrationExecutor.java
index 939d7c34d19..29802b1efd3 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RollbackMigrationExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/RollbackMigrationExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.RollbackMigrationStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationCheckExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationCheckExecutor.java
index 14788b05fff..980a06c12c8 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationCheckExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationCheckExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.ConsistencyCheckJobType;
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.ConsistencyCheckJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.StartMigrationCheckStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationExecutor.java
index c9eef8c3086..be97aad9b35 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StartMigrationExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobManager;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.StartMigrationStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationCheckExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationCheckExecutor.java
index 05b4d5a232a..a5e000a0307 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationCheckExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationCheckExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.ConsistencyCheckJobType;
import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.api.ConsistencyCheckJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.StopMigrationCheckStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationExecutor.java
index a6a050a7e81..5428bc0ef5d 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/StopMigrationExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.handl
import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobManager;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.StopMigrationStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.mode.manager.ContextManager;
/**
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/UnregisterMigrationSourceStorageUnitExecutor.java b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/UnregisterMigrationSourceStorageUnitExecutor.java
index 0ca555b6cc1..532f67c6adc 100644
--- a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/UnregisterMigrationSourceStorageUnitExecutor.java
+++ b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/UnregisterMigrationSourceStorageUnitExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey;
import org.apache.shardingsphere.data.pipeline.core.job.api.TransmissionJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.api.MigrationJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.distsql.statement.updatable.UnregisterMigrationSourceStorageUnitStatement;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
similarity index 100%
rename from kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor
rename to kernel/data-pipeline/scenario/migration/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor
diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGenerator.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGenerator.java
index 72a3ad2c8a0..65e9bafa322 100644
--- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGenerator.java
+++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGenerator.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.globalclock.distsql.handler;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedSnapshotInfo;
-import org.apache.shardingsphere.distsql.handler.executor.export.spi.ExportedSnapshotInfoGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedSnapshotInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi.ExportedSnapshotInfoGenerator;
import org.apache.shardingsphere.globalclock.provider.GlobalClockProvider;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
index 8d810505ced..7733d9db6a3 100644
--- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
+++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.globalclock.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
index dd6368ce39f..4419d3135f8 100644
--- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
+++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.globalclock.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
diff --git a/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.export.spi.ExportedSnapshotInfoGenerator b/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi.ExportedSnapshotInfoGenerator
similarity index 100%
rename from kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.export.spi.ExportedSnapshotInfoGenerator
rename to kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi.ExportedSnapshotInfoGenerator
diff --git a/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor b/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
similarity index 100%
rename from kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor
rename to kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
diff --git a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGeneratorTest.java b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGeneratorTest.java
index 474af592a8b..156b27759d9 100644
--- a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGeneratorTest.java
+++ b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/GlobalClockExportedSnapshotInfoGeneratorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.globalclock.distsql.handler;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedSnapshotInfo;
-import org.apache.shardingsphere.distsql.handler.executor.export.spi.ExportedSnapshotInfoGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedSnapshotInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.spi.ExportedSnapshotInfoGenerator;
import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
import org.apache.shardingsphere.globalclock.provider.GlobalClockProvider;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
index 030810143c0..fabf6cbf129 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.single.distsql.handler.converter;
import com.google.common.base.Joiner;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
/**
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetriever.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetriever.java
index bf884648f1c..26e7ab0f97e 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetriever.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetriever.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.single.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
index 6d657958df7..644162c4734 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.single.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.single.distsql.statement.rql.ShowDefaultSingleTableStorageUnitStatement;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutor.java
index 320b9b02e3d..04c0c076b67 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutor.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.single.distsql.handler.query;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutor.java
index da89e39c3fe..5ebb756f6b3 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutor.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.single.distsql.handler.query;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorDatabaseAware;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilder.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilder.java
index 36f47a28a88..8bd25c48610 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilder.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.single.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.table.TableMapperRuleAttribute;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
index 75768397294..906584e0375 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutor.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.database.connector.core.metadata.identifier.Ide
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.database.exception.core.exception.syntax.table.TableExistsException;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutor.java
index b4324058422..e20e34fdd3d 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/SetDefaultSingleTableStorageUnitExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.distsql.handler.update;
import com.google.common.base.Strings;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storageunit.MissingRequiredStorageUnitsException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
index 8567daf801a..e5f2c6d0af6 100644
--- a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
+++ b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutor.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.single.distsql.handler.update;
import lombok.Setter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.table.NoSuchTableException;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleAlterExecutor;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.required.DistSQLExecutorCurrentRuleRequired;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleAlterExecutor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
diff --git a/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter b/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
similarity index 100%
rename from kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter
rename to kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter
diff --git a/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever b/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
similarity index 100%
rename from kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever
rename to kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever
diff --git a/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder b/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
similarity index 100%
rename from kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder
rename to kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder
diff --git a/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to kernel/single/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverterTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverterTest.java
index 52c596eb745..69a481e3041 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverterTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/converter/SingleRuleConfigurationToDistSQLConverterTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.single.distsql.handler.converter;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.convert.spi.RuleConfigurationToDistSQLConverter;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.spi.RuleConfigurationToDistSQLConverter;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.junit.jupiter.api.Test;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetrieverTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetrieverTest.java
index c8a7f37a02b..9e8a69f4add 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetrieverTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/InUsedSingleStorageUnitRetrieverTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.single.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.resource.spi.InUsedStorageUnitRetriever;
+import org.apache.shardingsphere.distsql.handler.executor.resource.spi.InUsedStorageUnitRetriever;
import org.apache.shardingsphere.distsql.statement.type.rql.rule.database.ShowRulesUsedStorageUnitStatement;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutorTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutorTest.java
index 457888a54e4..ac4cbddb66f 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutorTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTablesExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.distsql.handler.query;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
index a0e6fa7372a..4b3eda96ed4 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTablesExecutorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.single.distsql.handler.query;
import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilderTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilderTest.java
index 22999bd1140..9ab1bbe391e 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilderTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/query/SingleCountResultRowBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.single.distsql.handler.query;
-import org.apache.shardingsphere.distsql.handler.executor.rql.rule.spi.CountResultRowBuilder;
+import org.apache.shardingsphere.distsql.handler.executor.rule.spi.CountResultRowBuilder;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.attribute.table.TableMapperRuleAttribute;
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
index e1017b4788c..6767f6de57c 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/LoadSingleTableExecutorTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.database.connector.core.metadata.database.metad
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.database.exception.core.exception.syntax.table.TableExistsException;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.datanode.InvalidDataNodeFormatException;
@@ -234,9 +234,7 @@ class LoadSingleTableExecutorTest {
DialectDatabaseMetaData dialectDatabaseMetaData = mock(DialectDatabaseMetaData.class, RETURNS_DEEP_STUBS);
when(dialectDatabaseMetaData.getSchemaOption().getDefaultSchema()).thenReturn(Optional.of("foo_schema"));
when(dialectDatabaseMetaData.getSchemaOption().isSchemaAvailable()).thenReturn(schemaAvailable);
- return mockConstruction(DatabaseTypeRegistry.class, (mock, context) -> {
- when(mock.getDialectDatabaseMetaData()).thenReturn(dialectDatabaseMetaData);
- });
+ return mockConstruction(DatabaseTypeRegistry.class, (mock, context) -> when(mock.getDialectDatabaseMetaData()).thenReturn(dialectDatabaseMetaData));
}
private static Stream<Arguments> assertCheckBeforeUpdateWithPreValidationFailureArguments() {
diff --git a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutorTest.java b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutorTest.java
index dda5d5f18ca..c46b720cd41 100644
--- a/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutorTest.java
+++ b/kernel/single/distsql/handler/src/test/java/org/apache/shardingsphere/single/distsql/handler/update/UnloadSingleTableExecutorTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.database.connector.core.metadata.database.metad
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.database.exception.core.exception.syntax.table.NoSuchTableException;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.exception.kernel.metadata.rule.MissingRequiredRuleException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
diff --git a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGenerator.java b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGenerator.java
index f9450dc0003..73446f1e0d0 100644
--- a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGenerator.java
+++ b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGenerator.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sqlfederation.distsql.handler;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.executor.rul.spi.PreviewExecutionUnitGenerator;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.preview.spi.PreviewExecutionUnitGenerator;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
diff --git a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
index 6ec7d1c5ddf..24c64f6b901 100644
--- a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
+++ b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sqlfederation.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sqlfederation.config.SQLFederationRuleConfiguration;
diff --git a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleExecutor.java b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleExecutor.java
index ffe910deab2..64f4270cd8a 100644
--- a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleExecutor.java
+++ b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sqlfederation.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.sqlfederation.config.SQLFederationCacheOption;
import org.apache.shardingsphere.sqlfederation.config.SQLFederationRuleConfiguration;
import org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment;
diff --git a/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rul.spi.PreviewExecutionUnitGenerator b/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.preview.spi.PreviewExecutionUnitGenerator
similarity index 100%
rename from kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.rul.spi.PreviewExecutionUnitGenerator
rename to kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.preview.spi.PreviewExecutionUnitGenerator
diff --git a/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor b/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
similarity index 100%
rename from kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor
rename to kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
diff --git a/kernel/sql-federation/distsql/handler/src/test/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGeneratorTest.java b/kernel/sql-federation/distsql/handler/src/test/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGeneratorTest.java
index e05f846a40b..cd3310ff6c3 100644
--- a/kernel/sql-federation/distsql/handler/src/test/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGeneratorTest.java
+++ b/kernel/sql-federation/distsql/handler/src/test/java/org/apache/shardingsphere/sqlfederation/distsql/handler/SQLFederationPreviewExecutionUnitGeneratorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.sqlfederation.distsql.handler;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.executor.rul.spi.PreviewExecutionUnitGenerator;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.preview.spi.PreviewExecutionUnitGenerator;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
diff --git a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ParseDistSQLExecutor.java b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ParseDistSQLExecutor.java
index 723b0770409..75374e1fd9f 100644
--- a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ParseDistSQLExecutor.java
+++ b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ParseDistSQLExecutor.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.parser.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorConnectionContextAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rul.sql.ParseStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
diff --git a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
index 76d7a1073c9..2b04d2b841b 100644
--- a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
+++ b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.parser.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
diff --git a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleExecutor.java b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleExecutor.java
index 9019a304817..3408af43f53 100644
--- a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleExecutor.java
+++ b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.parser.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement;
diff --git a/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor b/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
similarity index 100%
rename from kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor
rename to kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
diff --git a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
index 5abbfe07b80..93af33c36ff 100644
--- a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
+++ b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.sqltranslator.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.sqltranslator.config.SQLTranslatorRuleConfiguration;
diff --git a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleExecutor.java b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleExecutor.java
index c00a11880f9..57cbf283665 100644
--- a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleExecutor.java
+++ b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sqltranslator.distsql.handler.update;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.sqltranslator.config.SQLTranslatorRuleConfiguration;
import org.apache.shardingsphere.sqltranslator.distsql.statement.updateable.AlterSQLTranslatorRuleStatement;
import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule;
diff --git a/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor b/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
similarity index 100%
rename from kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor
rename to kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
diff --git a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
index e3f8cac640a..4e27b0feedd 100644
--- a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
+++ b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.transaction.distsql.handler.query;
import lombok.Setter;
-import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.aware.DistSQLExecutorRuleAware;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
diff --git a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
index 667dce67d1e..25ecadcc83d 100644
--- a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
+++ b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.transaction.distsql.handler.update;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor;
import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
diff --git a/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor b/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
similarity index 100%
rename from kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor
rename to kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor
diff --git a/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor b/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
similarity index 100%
rename from kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor
rename to kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.global.GlobalRuleDefinitionExecutor
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
index 48832a1a16d..8b2e97d392e 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
index f643e7f2b6c..fae7d409b09 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLUpdateProxyBackendHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.session.query.QueryContext;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLExecutorSPITest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLExecutorSPITest.java
index e7ab99d0265..5cf82293c14 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLExecutorSPITest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLExecutorSPITest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.junit.jupiter.api.Test;
import java.util.Collection;
@@ -48,9 +48,12 @@ class DistSQLExecutorSPITest {
}
private boolean isMigratedExecutor(final String className) {
- return className.startsWith("org.apache.shardingsphere.distsql.handler.executor.ral.queryable.")
- || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.ral.updatable.")
- || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.rul.")
+ return className.startsWith("org.apache.shardingsphere.distsql.handler.executor.configuration.")
+ || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.metadata.")
+ || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.computenode.")
+ || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.variable.")
+ || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.lock.")
+ || className.startsWith("org.apache.shardingsphere.distsql.handler.executor.preview.")
|| "org.apache.shardingsphere.parser.distsql.handler.query.ParseDistSQLExecutor".equals(className);
}
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
index 64be90b10a0..5bd4fd09519 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryProxyBackendHandlerTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.UnknownDatabaseException;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.QueryableRALStatement;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportDatabaseConfigurationStatement;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/FixtureDatabaseRuleCreateExecutor.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/FixtureDatabaseRuleCreateExecutor.java
index 201fff6c604..e69533c20f0 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/FixtureDatabaseRuleCreateExecutor.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/FixtureDatabaseRuleCreateExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.fixture;
-import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.type.DatabaseRuleCreateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.type.DatabaseRuleCreateExecutor;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.test.infra.fixture.rule.MockedRule;
import org.apache.shardingsphere.test.infra.fixture.rule.MockedRuleConfiguration;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
index cb1d6efa10e..71d3505ed73 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeInfoExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodeInfoExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodeInfoExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodeInfoStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeModeExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeModeExecutorTest.java
index f3a5799875f..5a1fb28740a 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeModeExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodeModeExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodeModeExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodeModeExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodeModeStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
index eb0c20656cf..e07df437029 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/computenode/ShowComputeNodesExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.computenode.ShowComputeNodesExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.computenode.ShowComputeNodesExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowComputeNodesStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportDatabaseConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportDatabaseConfigurationExecutorTest.java
index 100d275b42e..3bea5ac63cc 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportDatabaseConfigurationExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportDatabaseConfigurationExecutorTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportDatabaseConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportDatabaseConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportDatabaseConfigurationStatement;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportMetaDataExecutorTest.java
index baeb6fd61fd..80b2a62d39c 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportMetaDataExecutorTest.java
@@ -21,12 +21,12 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedClusterInfo;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedMetaData;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedClusterInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportMetaDataStatement;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
import org.apache.shardingsphere.globalclock.rule.builder.DefaultGlobalClockRuleConfigurationBuilder;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutorTest.java
index 189a55c523f..995097837fa 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ExportStorageNodesExecutorTest.java
@@ -21,8 +21,8 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ExportStorageNodesExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.ExportStorageNodesExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.export.ExportStorageNodesStatement;
import org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.keygen.impl.ColumnKeyGenerateStrategiesRuleConfiguration;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ShowTableMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ShowTableMetaDataExecutorTest.java
index ce654863ed0..ba8434c69d6 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ShowTableMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/export/ShowTableMetaDataExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.export.ShowTableMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.metadata.ShowTableMetaDataExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowTableMetaDataStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariableExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariableExecutorTest.java
index 1b7677c9a74..abe35d2ecf5 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariableExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariableExecutorTest.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.common.DistSQLVariable;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable.ShowDistVariableExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.variable.DistSQLVariable;
+import org.apache.shardingsphere.distsql.handler.executor.variable.ShowDistVariableExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowDistVariableStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariablesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariablesExecutorTest.java
index d594e3729a6..9a5a9fe03ab 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariablesExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/variable/ShowDistVariablesExecutorTest.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.variable.ShowDistVariablesExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.variable.ShowDistVariablesExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.show.ShowDistVariablesStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/yaml/ConvertYamlConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/yaml/ConvertYamlConfigurationExecutorTest.java
index b1c4360bf72..6742fe98932 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/yaml/ConvertYamlConfigurationExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/yaml/ConvertYamlConfigurationExecutorTest.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ya
import com.google.common.base.Splitter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.ral.queryable.yaml.ConvertYamlConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.convert.ConvertYamlConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.queryable.convert.ConvertYamlConfigurationStatement;
import org.apache.shardingsphere.infra.exception.generic.FileIOException;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutorTest.java
index 9d03ecdea37..a46002af663 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/computenode/SetComputeNodeStateExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.computenode;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.computenode.SetComputeNodeStateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.computenode.SetComputeNodeStateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetComputeNodeStateStatement;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportDatabaseConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportDatabaseConfigurationExecutorTest.java
index 84664cb4325..64028783d5b 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportDatabaseConfigurationExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportDatabaseConfigurationExecutorTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.im
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.DatabaseCreateExistsException;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportDatabaseConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportDatabaseConfigurationExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportMetaDataExecutorTest.java
index af3d9d61c96..55cede50950 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/imports/ImportMetaDataExecutorTest.java
@@ -22,8 +22,8 @@ import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.database.DatabaseCreateExistsException;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.ImportMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.imports.ImportMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.ImportMetaDataStatement;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
import org.apache.shardingsphere.globalclock.rule.builder.DefaultGlobalClockRuleConfigurationBuilder;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterOperationTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterOperationTest.java
index dbde3f3d363..3ae44b6fe5e 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterOperationTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/LockClusterOperationTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.LockClusterOperation;
+import org.apache.shardingsphere.distsql.handler.executor.lock.LockClusterOperation;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
index 6141c153956..3403480452e 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/lock/UnlockClusterExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.lock.UnlockClusterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.lock.UnlockClusterExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.exclusive.ExclusiveOperatorEngine;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshDatabaseMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshDatabaseMetaDataExecutorTest.java
index b1505542ce8..c55d3f430a0 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshDatabaseMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshDatabaseMetaDataExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshDatabaseMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshDatabaseMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshDatabaseMetaDataStatement;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshTableMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshTableMetaDataExecutorTest.java
index 8747b222ce5..f823d96c687 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshTableMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/refresh/RefreshTableMetaDataExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.refresh.RefreshTableMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.metadata.RefreshTableMetaDataExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.infra.exception.kernel.metadata.SchemaNotFoundException;
import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutorTest.java
index 29a05ebe72f..9272b6ca70a 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/variable/SetDistVariableExecutorTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.variable;
-import org.apache.shardingsphere.distsql.handler.engine.update.spi.DistSQLUpdateExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.variable.SetDistVariableExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.update.DistSQLUpdateExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.variable.SetDistVariableExecutor;
import org.apache.shardingsphere.distsql.statement.type.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutorTest.java
index 28116e2eef7..5430ab919e9 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutorTest.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.database.exception.core.exception.syntax.sql.DialectSQLParsingException;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
-import org.apache.shardingsphere.distsql.handler.engine.query.spi.DistSQLQueryExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.rul.PreviewExecutor;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.executor.preview.PreviewExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.spi.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.type.rul.sql.PreviewStatement;
import org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ClusterExportMetaDataGeneratorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ClusterExportMetaDataGeneratorTest.java
index d8f5cf849ee..c73ea6ac794 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ClusterExportMetaDataGeneratorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ClusterExportMetaDataGeneratorTest.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.proxy.backend.util;
-import org.apache.shardingsphere.distsql.handler.executor.export.ClusterExportMetaDataGenerator;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedClusterInfo;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.ClusterExportMetaDataGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedClusterInfo;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
import org.apache.shardingsphere.globalclock.provider.GlobalClockProvider;
import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
index fdeee7466ab..b5ec7e28ee2 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.util;
-import org.apache.shardingsphere.distsql.handler.executor.export.DatabaseExportMetaDataGenerator;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.DatabaseExportMetaDataGenerator;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.datasource.pool.props.domain.synonym.ConnectionPropertySynonyms;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ExportUtilsTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ExportUtilsTest.java
index c5bcbaa31f0..bce6fca13f0 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ExportUtilsTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/ExportUtilsTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.util;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportUtils;
+import org.apache.shardingsphere.distsql.handler.util.ExportUtils;
import org.apache.shardingsphere.infra.exception.generic.FileIOException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
index 85eab43be5e..dcac6d6ed20 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutorTest.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.proxy.backend.util;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlExportedServerConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.export.ExportedMetaData;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.MetaDataImportExecutor;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.YamlDatabaseConfigurationImportExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.export.model.ExportedMetaData;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.imports.MetaDataImportExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.imports.YamlDatabaseConfigurationImportExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlExportedServerConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutorTest.java
index 51ba2252069..71f077d18f2 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutorTest.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.proxy.backend.util;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDataSourceConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.YamlDatabaseConfiguration;
-import org.apache.shardingsphere.distsql.handler.executor.config.yaml.swapper.YamlDataSourceConfigurationSwapper;
-import org.apache.shardingsphere.distsql.handler.executor.ral.updatable.imports.YamlDatabaseConfigurationImportExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.imports.YamlDatabaseConfigurationImportExecutor;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDataSourceConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.YamlDatabaseConfiguration;
+import org.apache.shardingsphere.distsql.handler.executor.configuration.yaml.swapper.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.distsql.handler.validate.DistSQLDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties;
diff --git a/proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor b/proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
similarity index 100%
rename from proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor
rename to proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.executor.spi.update.rule.database.DatabaseRuleDefinitionExecutor
diff --git a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLDatabaseRuleQueryExecutorAssert.java b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLDatabaseRuleQueryExecutorAssert.java
index dc74b5a0eb1..a9dc48a8623 100644
--- a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLDatabaseRuleQueryExecutorAssert.java
+++ b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLDatabaseRuleQueryExecutorAssert.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.it.distsql.handler.engine.query;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
diff --git a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLGlobalRuleQueryExecutorAssert.java b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLGlobalRuleQueryExecutorAssert.java
index 92b31932e45..2a359c1967a 100644
--- a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLGlobalRuleQueryExecutorAssert.java
+++ b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/query/DistSQLGlobalRuleQueryExecutorAssert.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.it.distsql.handler.engine.query;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.config.rule.scope.GlobalRuleConfiguration;
diff --git a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/DistSQLGlobalRuleDefinitionExecutorAssert.java b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/DistSQLGlobalRuleDefinitionExecutorAssert.java
index 64b6d6b0a52..6681fa7bcd2 100644
--- a/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/DistSQLGlobalRuleDefinitionExecutorAssert.java
+++ b/test/it/distsql/src/main/java/org/apache/shardingsphere/test/it/distsql/handler/engine/update/DistSQLGlobalRuleDefinitionExecutorAssert.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.it.distsql.handler.engine.update;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
+import org.apache.shardingsphere.distsql.handler.context.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecuteEngine;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;