diff --git a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java index 5f943f67bbf5d..95eb857f0de09 100644 --- a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java +++ b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java @@ -20,11 +20,11 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.agent.plugin.core.enums.SQLStatementType; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java index c5aace1f5b45a..9c1c0c14ca18c 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdviceTest.java @@ -22,9 +22,9 @@ import org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration; import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.MetricsCollectorFixture; import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.TargetAdviceObjectFixture; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationListStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java index dcf7dfd3eda49..c4832062b2ab0 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java index 152895872b4f8..63fbf72d25519 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import java.util.Collection; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java index 01d2712bee1e1..587ea2777a32e 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java index 952df9f053cb2..a6d91ec1f42c6 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java index 28ef0380a6a1d..351bcc98cdede 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionAlterUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java index 4a1d70a9c483e..636ccc2c8ff4d 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.api.encrypt.assisted.AssistedEncryptAlgorithm; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java index 89f7f95c53b07..2b1e792779440 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.distsql.handler.converter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java index 5179b09a7bd68..dc0d60ebd6cae 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java index e73796c150fc6..4f88754226aff 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java index eb3b187bf3bc7..79cf6d5d4a815 100644 --- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java +++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.PropertyContext; import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.ShowEncryptRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.TableNameContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java index 2a79493893e18..716caadcff409 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java index cf0fb400800aa..fa3e3c2dc55e8 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import java.util.Collection; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java index ba484a64740c8..19fb939dd44a9 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java index 57454e9046d88..0b2edf361f0bc 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import java.util.Collection; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java index bb803add45481..8b1d21378857d 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java index 3c8272a370736..3eb42d1bad069 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java index cc0eb5ae33042..2be3381d4bef9 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.distsql.handler.converter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java index 44050f06fdbcd..8e953fcfe4fef 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java index 39c5d9a30c878..caf8c8e677d6c 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.handler.update; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; diff --git a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java index 1cd9769284f00..22d03ce01d7fb 100644 --- a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java +++ b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java @@ -30,7 +30,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.PropertiesDefinitionContext; import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.PropertyContext; import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ShowMaskRulesContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java index 02a615ab496bd..2e6c45ce68b93 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java index 19d7da9ce6eee..c51fb82465dbc 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import java.util.Collection; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java index 9861ad8927896..564fc8ce2910f 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mask.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java index 058cc36378aff..82d85ea8d190e 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import java.util.Collection; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java index 4012ee78abc45..3a7ff16f46262 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java index 5a150f6b7d644..e48b69570818f 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java index 88758673f0098..7551c3d9947f4 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.handler.converter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java index e87031c48db13..d26da673de9a7 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java index 110ce61d03f8d..bb1def65019e5 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule; diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java index 311742c7ef474..6a9d75d355a07 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java +++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ReadwriteSplittingRuleDefinitionContext; import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowStatusFromReadwriteSplittingRulesContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.CountReadwriteSplittingRuleStatement; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java index 9033d12363234..1f79a78c0c4da 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java index 56c6bcb7ee739..0a8be6e32b67c 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java index a66f676ebe9f2..11c4f9d6d143b 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java index 346b0490b817e..5eb16ed48b0d2 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java index 146e2b4a78afd..249dff4dc9ec2 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java index 56794fd8de2ae..9ddac7816fc02 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java index 861da413c609f..5257896151f04 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java index 8d02b60c7dcfd..0ae8c29943717 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java index e9cc7b906de2c..cf29d4f64f998 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionAlterUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java index 91db64ccc0a2d..e34afee13a23f 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.DuplicateAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java index 51df13d17d248..50f35d35c6538 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.distsql.converter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.converter.ShadowRuleStatementConverter; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java index 40fdef0db6c4a..9528ef5bd6dbe 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java index d3420cd92dab3..18684114e1cb6 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java index f9a07e2a0b172..54b6aa2adcd90 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.distsql.update; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java index 420db8ab2b176..f31f75ec35256 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule; diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java index d3b4186a19233..6d8b9fb3d23ca 100644 --- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java +++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java @@ -36,7 +36,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowAlgorithmsContext; import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowTableRulesContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java index 22054d9871613..dfc9c8dd1b88a 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java index 983014a662f6e..d719be6fc124b 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java index 7cae8692458f6..d70e517703509 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java index 29752b915ab2a..54a53f7693686 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java index 1b89d1bbb80cf..5a24330e4630a 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java index 3a1a42d44e5cf..86df1b5daed9c 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java index 993bc30364c2b..57adb50d3e75a 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java index 0efdfdb9f1f3d..9f7c4f69a5568 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; /** * Drop default shadow algorithm statement. diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java index 4def6e78e8fae..df672fb4e64d9 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java index da1b89e7f5f88..c91a1f939cee9 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java index 7e8de33b6f2f8..bffaafd4f3e6a 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java index d486fc147ad80..fcd345b739223 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java index 1c4c34ef88dd7..a1e6feaa93d7b 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java index ee9dfca9f34f0..0077a1d3fc686 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java index b9a579ff0a5a7..22dfe5cfca058 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory; 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/ShardingTableRuleStatementConverter.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java index 021b63d33b7f2..92a5561504aa4 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; 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/AlterDefaultShardingStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java index 70627b3a338f8..1d9fcdbe1666f 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionAlterUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java index a1448d6d8fecf..36a722267b504 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java index 307c677b2afa6..7a2f6976bb3a6 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java index 3fdc8002043e7..32e88cfaef7ed 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.converter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java index 8ab14eae9d334..1bf1f517c1921 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java index c8d32f772fd31..cce328794114c 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.update; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java index 706a871ec7829..fdcd6caaccb08 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.exception.algorithm.InvalidAlgorithmConfigurationException; import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java index fa4fd86dfa46b..0587782c7d6d9 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java @@ -20,8 +20,8 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException; import org.apache.shardingsphere.distsql.parser.engine.spi.FeaturedDistSQLStatementParserFacade; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java index b05bfe9b4ab51..38bc9ac326b64 100644 --- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java +++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java @@ -62,7 +62,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.StorageUnitsContext; import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableNameContext; import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableReferenceRuleDefinitionContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java index 84b50f9165ef4..9e8ddef5de92a 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.segment.strategy; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java index 187220ec49841..15649c5500968 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java index 4f739d120ad61..201b8c065548b 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java index 8f230959f95ec..9f3835d9251fc 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java index d31b8f6e03041..62b520396ea41 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java @@ -19,8 +19,8 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; /** * Alter default sharding strategy statement. diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java index fa134de1b4289..8d824a4b6a5d8 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java index 3bc1f9204f5d6..410639f1f04a0 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java index abd7eae091028..36060c3ea303e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java index fedd60ebb20ee..335539b16ce09 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; /** * Create default sharding strategy statement. diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java index ea43ddaba1537..5c4e1c91897cc 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java index 2c240f8a84b2f..f5ba08924d5f9 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java index cfb4749769608..45b9f5848a2e9 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; /** * Drop default sharding strategy statement. diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java index b81ec50ed3e35..17b3442790f44 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java index 436f132a53a90..145f4e3af5415 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java index dee82cdccf50b..ef3f49c33d0bb 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java index 9c119ef8763de..8990476f0b0bd 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java index d1db46521cde2..3ffbac8ec6b87 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java index e0119c6b77bcc..d9f36423f54e7 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java index 899f83b601e05..bf0a76e3bbf4f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java index e10a567b81b09..f4ff4f2cd376d 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java index d7c516ca58c88..a1ad28f059a6a 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java index 72ff603e94330..f4df90cf5749d 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java index 9211b1d1956b7..2d0d2b64cd691 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java index f2af17640ad5e..6cb03f6f4e20e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java index bfdb8233b689f..58b152ad939b2 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java index 5992ab3ab7597..a986a4398d3cb 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java index b4f7a5097842f..25f2eebe551db 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java index 0f463ebaf155a..a74040ef06086 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java index ce57ac0e0478f..ce12573c5472e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java index 3adbf0c9072fe..841f4eccea6d1 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sharding.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java index 3da2fee284d00..e6ecbc2bbc919 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.query; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java index 53aee23121673..61ae91cdaa66a 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.ral.query; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; 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/ral/query/InstanceContextRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java index 72bc34d68b1f9..a2694437d74dd 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.ral.query; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java index 1045345dd90b5..80b528a50733a 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.ral.query; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java index 4aa3ee3457fd4..208d8fa2012cc 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.ral.query; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java index 7c9e214f6b9e6..cedffcd728b5f 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.ral.update; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java index 5a717a142b50c..1260cae6b7ec0 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.distsql.handler.rul; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI; diff --git a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java index ecf2f86914119..4ec06a41e7b9d 100644 --- a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java +++ b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.authority.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show authority rule statement. diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/CheckMigrationJobUpdater.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/CheckMigrationJobUpdater.java index 0c2ec012b5f6f..a875439f4da27 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/CheckMigrationJobUpdater.java +++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/CheckMigrationJobUpdater.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.migration.distsql.statement.CheckMigrationStatement; diff --git a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitUpdater.java b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitUpdater.java index 3f89bbe8794ec..8dde82c6b6b6d 100644 --- a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitUpdater.java +++ b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/RegisterMigrationSourceStorageUnitUpdater.java @@ -21,10 +21,10 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.converter.DataSourceSegmentsConverter; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; diff --git a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java index cef053312ebfc..2792dc81f06de 100644 --- a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java +++ b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java @@ -44,10 +44,10 @@ import org.apache.shardingsphere.distsql.parser.autogen.MigrationDistSQLStatementParser.StorageUnitDefinitionContext; import org.apache.shardingsphere.distsql.parser.autogen.MigrationDistSQLStatementParser.TargetTableNameContext; import org.apache.shardingsphere.distsql.parser.autogen.MigrationDistSQLStatementParser.UnregisterMigrationSourceStorageUnitContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.migration.distsql.statement.CheckMigrationStatement; import org.apache.shardingsphere.migration.distsql.statement.CommitMigrationStatement; diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/DropStreamingStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/DropStreamingStatement.java index a60e79d4d1ef2..1b41de8bce41e 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/DropStreamingStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/DropStreamingStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc.UpdatableCDCRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc.UpdatableCDCRALStatement; /** * Drop streaming statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingListStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingListStatement.java index dfc351605f36a..88fb0e288a32c 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingListStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingListStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.cdc.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc.QueryableCDCRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc.QueryableCDCRALStatement; /** * Show streaming list statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingStatusStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingStatusStatement.java index 716cc630b00e2..a739050f11df2 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingStatusStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/cdc/distsql/statement/ShowStreamingStatusStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc.QueryableCDCRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc.QueryableCDCRALStatement; /** * Show streaming status statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CheckMigrationStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CheckMigrationStatement.java index f7bef648e2341..d01936553d819 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CheckMigrationStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CheckMigrationStatement.java @@ -19,8 +19,8 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Check migration statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CommitMigrationStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CommitMigrationStatement.java index 2fbb699f8cfee..d7f7a1ad137fd 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CommitMigrationStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/CommitMigrationStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Commit migration statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/DropMigrationCheckStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/DropMigrationCheckStatement.java index 3836741e39c21..4781d654ad048 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/DropMigrationCheckStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/DropMigrationCheckStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Drop migration check statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/MigrateTableStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/MigrateTableStatement.java index d08773bd9a4fb..71124a3f939c8 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/MigrateTableStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/MigrateTableStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; import org.apache.shardingsphere.migration.distsql.statement.pojo.SourceTargetEntry; import java.util.List; diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RegisterMigrationSourceStorageUnitStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RegisterMigrationSourceStorageUnitStatement.java index 9761449877e1a..9d8c2cfb742fa 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RegisterMigrationSourceStorageUnitStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RegisterMigrationSourceStorageUnitStatement.java @@ -19,8 +19,8 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; import java.util.Collection; diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RollbackMigrationStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RollbackMigrationStatement.java index bdd26b57c773e..ae733faeb7a72 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RollbackMigrationStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/RollbackMigrationStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Rollback migration statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckAlgorithmsStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckAlgorithmsStatement.java index 6b802f75b76a2..3b3036eff18a6 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckAlgorithmsStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckAlgorithmsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.migration.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration check algorithms statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckStatusStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckStatusStatement.java index 6088b55fcb161..f6b79ccd5c82d 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckStatusStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationCheckStatusStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration check status statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationListStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationListStatement.java index 43c9dc5ee96e2..ed6a6d34d3c65 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationListStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationListStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.migration.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration list statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationSourceStorageUnitsStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationSourceStorageUnitsStatement.java index d916e60a1a56e..033b053b28fcc 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationSourceStorageUnitsStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationSourceStorageUnitsStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.migration.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration source storage units statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationStatusStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationStatusStatement.java index d7603d127717c..0239d9948d132 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationStatusStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/ShowMigrationStatusStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration status statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationCheckStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationCheckStatement.java index 7a251345d340e..4c16c1ff76e95 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationCheckStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationCheckStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Start migration check statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationStatement.java index 79d1120041621..c5a14b0e765fb 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StartMigrationStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Start migration statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationCheckStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationCheckStatement.java index 099ed09be77b0..09b4754d7120a 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationCheckStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationCheckStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Stop migration check statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationStatement.java index a52650c5407b2..531fba40cb6e4 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/StopMigrationStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Stop migration statement. diff --git a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/UnregisterMigrationSourceStorageUnitStatement.java b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/UnregisterMigrationSourceStorageUnitStatement.java index 0964f0add3f7d..84d9eb96beadb 100644 --- a/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/UnregisterMigrationSourceStorageUnitStatement.java +++ b/kernel/data-pipeline/distsql/statement/src/main/java/org/apache/shardingsphere/migration/distsql/statement/UnregisterMigrationSourceStorageUnitStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.migration.distsql.statement; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; import java.util.Collection; diff --git a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java index f8e71661c022a..bd6229c3dea1c 100644 --- a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java +++ b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.globalclock.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show global clock rule statement. diff --git a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java index 1897ebacd8844..bfd405ae471d0 100644 --- a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java +++ b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import java.util.Properties; diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java index 2b7c75f791529..76265f1dc0157 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/LoadSingleTableStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.single.distsql.segment.SingleTableSegment; import java.util.Collection; diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java index df16c7c3904e3..6f8e7770e715d 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/SetDefaultSingleTableStorageUnitStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; /** * Set default single table storage unit statement. diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java index 69ca6a98897e7..c53f580e0b139 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rdl/UnloadSingleTableStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import java.util.Collection; diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/CountSingleTableStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/CountSingleTableStatement.java index 45ff04510fda3..5e04cdf80747c 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/CountSingleTableStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/CountSingleTableStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.distsql.statement.rql; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java index 6ceab4cfe8f05..d7e6bb0b16a57 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowDefaultSingleTableStorageUnitStatement.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.single.distsql.statement.rql; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; /** diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowSingleTableStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowSingleTableStatement.java index eaa42c823c752..64dca27eef1f0 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowSingleTableStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowSingleTableStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.distsql.statement.rql; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowTablesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowUnloadedSingleTableStatement.java b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowUnloadedSingleTableStatement.java index 4703f8e69fcab..288d6225cb269 100644 --- a/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowUnloadedSingleTableStatement.java +++ b/kernel/single/distsql/statement/src/main/java/org/apache/shardingsphere/single/distsql/statement/rql/ShowUnloadedSingleTableStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.single.distsql.statement.rql; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowTablesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import java.util.Optional; diff --git a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java index e09a1b5c3c357..14f3773401f6c 100644 --- a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java +++ b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/queryable/ShowSQLFederationRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sqlfederation.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show SQL federation rule statement. diff --git a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java index e93154f08d554..780e801f33819 100644 --- a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java +++ b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment; /** diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java index eb48eee43d54a..cfa05f2b85072 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.parser.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show SQL parser rule statement. diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java index e65d67addddb6..980d54583a2ea 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; /** diff --git a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java index 4a3433a50a53b..583e666791554 100644 --- a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java +++ b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.sqltranslator.distsql.statement; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show SQL translator rule statement. diff --git a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java index 0c16447aa3cd2..5ca87a3543b69 100644 --- a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java +++ b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; diff --git a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java index eccc5c7b22c70..c4a8834a7b42e 100644 --- a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java +++ b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.traffic.distsql.handler.update; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.test.util.PropertiesBuilder; diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java index 4415e3ab42a57..c082ca039e416 100644 --- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java +++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.TrafficDistSQLStatementParser.PropertyContext; import org.apache.shardingsphere.distsql.parser.autogen.TrafficDistSQLStatementParser.ShowTrafficRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.TrafficDistSQLStatementParser.TrafficRuleDefinitionContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java index 02d3128b5c3fa..b118f774a2d21 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; import java.util.Collection; diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java index 3ec420826adc1..583cba7d29f1f 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show traffic rules statement. diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java index 92e9d2892aca3..29ee30acb6794 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; import java.util.Collection; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java index a865b59982a3e..c5f0d5d20c9a1 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.transaction.util; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement; diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java index 261fc4dd6d8fc..a845d26518d74 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.transaction.distsql.statement.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show transaction rule statement. diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java index 79f6d05abe7b3..4ec906969355a 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment; /** diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java index c6b3b602be03e..dc19089292b36 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java @@ -26,7 +26,6 @@ import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; -import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager; @@ -116,9 +115,8 @@ public Map getStorageUnits(final String databaseName) { public void reloadDatabaseMetaData(final String databaseName) { try { ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName); - ResourceMetaData currentResourceMetaData = database.getResourceMetaData(); - Map props = metaDataContexts.get().getPersistService().getDataSourceUnitService().load(databaseName); - SwitchingResource switchingResource = new ResourceSwitchManager().createByAlterDataSourcePoolProperties(currentResourceMetaData, props); + Map dataSourcePoolPropsFromRegCenter = metaDataContexts.get().getPersistService().getDataSourceUnitService().load(databaseName); + SwitchingResource switchingResource = new ResourceSwitchManager().createByAlterDataSourcePoolProperties(database.getResourceMetaData(), dataSourcePoolPropsFromRegCenter); metaDataContexts.get().getMetaData().getDatabases().putAll(configurationContextManager.renewDatabase(database, switchingResource)); MetaDataContexts reloadedMetaDataContexts = createMetaDataContexts(databaseName, switchingResource); deletedSchemaNames(databaseName, reloadedMetaDataContexts.getMetaData().getDatabase(databaseName), database); diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java index 2798809e46064..40d9ba91e096e 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java @@ -283,7 +283,7 @@ public Map renewDatabase(final ShardingSphereDat } private Map getNewStorageNodes(final Map currentStorageNodes, final SwitchingResource resource) { - Map result = new LinkedHashMap<>(); + Map result = new LinkedHashMap<>(currentStorageNodes.size(), 1F); for (Entry entry : currentStorageNodes.entrySet()) { if (!resource.getStaleDataSources().containsKey(entry.getKey())) { result.put(entry.getKey(), entry.getValue()); diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java index 105a5200b3b8e..218842573f1ec 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java @@ -25,6 +25,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnitNodeMapCreator; import javax.sql.DataSource; +import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -79,7 +80,7 @@ public SwitchingResource alterStorageUnit(final ResourceMetaData resourceMetaDat Map toBeAlteredStorageUintNodeMap = StorageUnitNodeMapCreator.create(mergedDataSourcePoolPropsMap); Map dataSourcePoolPropsMap = StorageNodeAggregator.aggregateDataSourcePoolProperties(mergedDataSourcePoolPropsMap); return new SwitchingResource(getAlterNewDataSources(toBeAlteredStorageUintNodeMap, dataSourcePoolPropsMap), - getStaleDataSources(resourceMetaData, toBeAlteredStorageUintNodeMap), new LinkedHashSet<>(toBeAlteredStorageUintNodeMap.keySet()), mergedDataSourcePoolPropsMap); + getStaleDataSources(resourceMetaData, toBeAlteredStorageUintNodeMap.values()), new LinkedHashSet<>(toBeAlteredStorageUintNodeMap.keySet()), mergedDataSourcePoolPropsMap); } private Map getAlterNewDataSources(final Map storageUintNodeMap, final Map dataSourcePoolPropsMap) { @@ -90,10 +91,10 @@ private Map getAlterNewDataSources(final Map getStaleDataSources(final ResourceMetaData resourceMetaData, final Map storageUintNodeMap) { - Map result = new LinkedHashMap<>(storageUintNodeMap.size(), 1F); + private Map getStaleDataSources(final ResourceMetaData resourceMetaData, final Collection storageNodes) { + Map result = new LinkedHashMap<>(storageNodes.size(), 1F); for (Entry entry : resourceMetaData.getDataSources().entrySet()) { - if (storageUintNodeMap.containsValue(entry.getKey())) { + if (storageNodes.contains(entry.getKey())) { result.put(entry.getKey(), entry.getValue()); } } @@ -112,21 +113,15 @@ public SwitchingResource unregisterStorageUnit(final ResourceMetaData resourceMe .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getDataSourcePoolProperties(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new))); mergedDataSourcePoolPropertiesMap.keySet().removeIf(each -> each.equals(storageUnitName)); resourceMetaData.getStorageUnits().remove(storageUnitName); - return new SwitchingResource( - Collections.emptyMap(), getToBeRemovedStaleDataSource(resourceMetaData, storageUnitName), Collections.singleton(storageUnitName), mergedDataSourcePoolPropertiesMap); + return new SwitchingResource(Collections.emptyMap(), + getToBeRemovedStaleDataSource(resourceMetaData, storageUnitName), Collections.singleton(storageUnitName), mergedDataSourcePoolPropertiesMap); } private Map getToBeRemovedStaleDataSource(final ResourceMetaData resourceMetaData, final String storageUnitName) { - Map metaDataMap = new LinkedHashMap<>( - resourceMetaData.getStorageUnits().entrySet().stream() - .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageNode(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new))); - StorageNode storageNode = metaDataMap.remove(storageUnitName); - Map reservedStorageUintNodeMap = resourceMetaData.getStorageUnits().entrySet().stream() - .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getStorageNode())); - Map result = new LinkedHashMap<>(1, 1F); - if (reservedStorageUintNodeMap.values().stream().noneMatch(each -> each.equals(storageNode))) { - result.put(storageNode, resourceMetaData.getDataSources().get(storageNode)); + if (!resourceMetaData.getStorageUnits().containsKey(storageUnitName)) { + return Collections.emptyMap(); } - return result; + StorageNode storageNode = resourceMetaData.getStorageUnits().get(storageUnitName).getStorageNode(); + return Collections.singletonMap(storageNode, resourceMetaData.getDataSources().get(storageNode)); } } diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java index 73d33b7355efc..9354d96412caa 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java @@ -82,10 +82,10 @@ public SwitchingResource createByDropResource(final ResourceMetaData resourceMet * @return created switching resource */ public SwitchingResource createByAlterDataSourcePoolProperties(final ResourceMetaData resourceMetaData, final Map toBeChangedPropsMap) { - Map mergedDataSourcePoolPropertiesMap = new LinkedHashMap<>(resourceMetaData.getStorageUnits().entrySet().stream() + Map mergedDataSourcePoolPropsMap = new LinkedHashMap<>(resourceMetaData.getStorageUnits().entrySet().stream() .collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getDataSourcePoolProperties(), (oldValue, currentValue) -> oldValue, LinkedHashMap::new))); - mergedDataSourcePoolPropertiesMap.keySet().removeIf(each -> !toBeChangedPropsMap.containsKey(each)); - mergedDataSourcePoolPropertiesMap.putAll(toBeChangedPropsMap); + mergedDataSourcePoolPropsMap.keySet().removeIf(each -> !toBeChangedPropsMap.containsKey(each)); + mergedDataSourcePoolPropsMap.putAll(toBeChangedPropsMap); Map toBeChangedStorageUnitNodeMap = StorageUnitNodeMapCreator.create(toBeChangedPropsMap); Map staleStorageDataSources = getStaleDataSources(resourceMetaData, toBeChangedPropsMap); staleStorageDataSources.putAll(getToBeDeletedDataSources(resourceMetaData.getDataSources(), toBeChangedStorageUnitNodeMap.values())); @@ -93,7 +93,7 @@ public SwitchingResource createByAlterDataSourcePoolProperties(final ResourceMet staleStorageUnitNames.addAll(getToBeDeletedStorageUnitNames(resourceMetaData.getStorageUnits(), toBeChangedStorageUnitNodeMap.keySet())); Map dataSourcePoolPropsMap = StorageNodeAggregator.aggregateDataSourcePoolProperties(toBeChangedPropsMap); return new SwitchingResource( - createNewDataSources(resourceMetaData, toBeChangedStorageUnitNodeMap, dataSourcePoolPropsMap), staleStorageDataSources, staleStorageUnitNames, mergedDataSourcePoolPropertiesMap); + createNewDataSources(resourceMetaData, toBeChangedStorageUnitNodeMap, dataSourcePoolPropsMap), staleStorageDataSources, staleStorageUnitNames, mergedDataSourcePoolPropsMap); } private Map createNewDataSources(final ResourceMetaData resourceMetaData, final Map toBeChangedStorageUnitNodeMap, diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java index 881dc58c42558..b32716805ff37 100644 --- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java +++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java @@ -65,41 +65,41 @@ import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.UnregisterStorageUnitContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.WorkerThreadContext; import org.apache.shardingsphere.distsql.parser.autogen.KernelDistSQLStatementParser.WriteDefinitionContext; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.InventoryIncrementalRuleSegment; -import org.apache.shardingsphere.distsql.parser.segment.ReadOrWriteSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportStorageNodesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeInfoStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeModeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowMigrationRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterComputeNodeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterInventoryIncrementalRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LockClusterStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInstanceStatusStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlockClusterStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowLogicalTablesStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesUsedStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.InventoryIncrementalRuleSegment; +import org.apache.shardingsphere.distsql.segment.ReadOrWriteSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ConvertYamlConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportStorageNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeInfoStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeModeStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariablesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowMigrationRuleStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.AlterComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.AlterInventoryIncrementalRuleStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshDatabaseMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetInstanceStatusStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowLogicalTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java index 3bd536b95f94c..63328889fa17d 100644 --- a/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java +++ b/parser/distsql/engine/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java @@ -21,9 +21,9 @@ import org.apache.shardingsphere.distsql.parser.autogen.UtilityDistSQLStatementParser.FormatSQLContext; import org.apache.shardingsphere.distsql.parser.autogen.UtilityDistSQLStatementParser.ParseSQLContext; import org.apache.shardingsphere.distsql.parser.autogen.UtilityDistSQLStatementParser.PreviewSQLContext; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; diff --git a/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java b/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java index 0fa3fd1e2f18d..98d5d3d66aee2 100644 --- a/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java +++ b/parser/distsql/engine/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.distsql.parser.rdl; import org.apache.shardingsphere.distsql.parser.engine.api.DistSQLStatementParserEngine; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/AlgorithmSegment.java similarity index 95% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/AlgorithmSegment.java index 548bb1d8cca62..6d9c17b5988f8 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/AlgorithmSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/AlgorithmSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/DataSourceSegment.java similarity index 95% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/DataSourceSegment.java index f38321d875da8..6bea868fcf8eb 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/DataSourceSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/DataSourceSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/HostnameAndPortBasedDataSourceSegment.java similarity index 96% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/HostnameAndPortBasedDataSourceSegment.java index 78b0608b8d91a..a8843a9ecadd6 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/HostnameAndPortBasedDataSourceSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/HostnameAndPortBasedDataSourceSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/InventoryIncrementalRuleSegment.java similarity index 95% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/InventoryIncrementalRuleSegment.java index d5134913bddb6..287097c4c8566 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/InventoryIncrementalRuleSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/InventoryIncrementalRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; import lombok.Setter; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/ReadOrWriteSegment.java similarity index 96% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/ReadOrWriteSegment.java index 5b8e5c860680c..214fc7f34f810 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/ReadOrWriteSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/ReadOrWriteSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/URLBasedDataSourceSegment.java similarity index 95% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/URLBasedDataSourceSegment.java index 792d3e8913972..4475c68f66cfe 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/URLBasedDataSourceSegment.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/URLBasedDataSourceSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment; +package org.apache.shardingsphere.distsql.segment; import lombok.Getter; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java similarity index 90% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java index d9632ce5515a2..56e1a702b8cff 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverter.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverter.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment.converter; +package org.apache.shardingsphere.distsql.segment.converter; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/DistSQLStatement.java similarity index 94% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/DistSQLStatement.java index 177f5c374ae5a..64fd809a58270 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/DistSQLStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/DistSQLStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement; +package org.apache.shardingsphere.distsql.statement; import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/FeaturedRALStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/FeaturedRALStatement.java index 71c8c5c848abe..ebc034bd927a8 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/FeaturedRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/FeaturedRALStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral; +package org.apache.shardingsphere.distsql.statement.ral; /** * Featured RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/QueryableRALStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/QueryableRALStatement.java index 093c18c7d0485..9c9499ed956ee 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/QueryableRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/QueryableRALStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral; +package org.apache.shardingsphere.distsql.statement.ral; /** * Queryable RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/RALStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/RALStatement.java index 1bca62fc3471d..760be3e3266a9 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/RALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/RALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral; +package org.apache.shardingsphere.distsql.statement.ral; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; /** * RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableGlobalRuleRALStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableGlobalRuleRALStatement.java index 5c4b81dc31dbc..fdee6ec053931 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableGlobalRuleRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableGlobalRuleRALStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral; +package org.apache.shardingsphere.distsql.statement.ral; /** * Updatable RAL statement for global rule. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableRALStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableRALStatement.java index f1e54cc25f204..a836ffee7f4e5 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/UpdatableRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/UpdatableRALStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral; +package org.apache.shardingsphere.distsql.statement.ral; /** * Updatable RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/PipelineRALStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/PipelineRALStatement.java index 37e569291050c..c4f9d6ee44abc 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/PipelineRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/PipelineRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline; +package org.apache.shardingsphere.distsql.statement.ral.pipeline; -import org.apache.shardingsphere.distsql.parser.statement.ral.FeaturedRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.FeaturedRALStatement; /** * Pipeline RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/QueryablePipelineRALStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/QueryablePipelineRALStatement.java index 8bb329fc34da7..90792d8b9f401 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/QueryablePipelineRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/QueryablePipelineRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline; +package org.apache.shardingsphere.distsql.statement.ral.pipeline; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Queryable pipeline RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/UpdatablePipelineRALStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/UpdatablePipelineRALStatement.java index 9789a35ed3aef..f7667dd1cce53 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/UpdatablePipelineRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/UpdatablePipelineRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline; +package org.apache.shardingsphere.distsql.statement.ral.pipeline; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Updatable pipeline RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/CDCRALStatement.java similarity index 84% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/CDCRALStatement.java index 8306641c47517..8e2bccaad597e 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/CDCRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/CDCRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.PipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.PipelineRALStatement; /** * CDC RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java similarity index 84% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java index 17a0a0f85dca3..ce5a222450fa5 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/QueryableCDCRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.QueryablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.QueryablePipelineRALStatement; /** * Queryable CDC RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java similarity index 84% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java index 120cc16e584c1..90bee514c6baf 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/cdc/UpdatableCDCRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.cdc; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.cdc; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.UpdatablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.UpdatablePipelineRALStatement; /** * Updatable CDC RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/MigrationRALStatement.java similarity index 83% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/MigrationRALStatement.java index 836a5cb6cace0..3cb09a1aa515c 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/MigrationRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/MigrationRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.migration; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.PipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.PipelineRALStatement; /** * Migration RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java similarity index 84% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java index 29d2badee5af2..8f065b915ba51 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/QueryableMigrationRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.migration; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.QueryablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.QueryablePipelineRALStatement; /** * Queryable migration RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java similarity index 84% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java index cb0000fd407a3..b46c07e4b6a03 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/pipeline/migration/UpdatableMigrationRALStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration; +package org.apache.shardingsphere.distsql.statement.ral.pipeline.migration; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.UpdatablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.UpdatablePipelineRALStatement; /** * Updatable migration RAL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ConvertYamlConfigurationStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ConvertYamlConfigurationStatement.java index 7863298bcda08..9b3b2f787cf58 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ConvertYamlConfigurationStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ConvertYamlConfigurationStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Convert YAML configuration statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportDatabaseConfigurationStatement.java similarity index 91% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportDatabaseConfigurationStatement.java index 25d9b9206503a..885c546c77225 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportDatabaseConfigurationStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportDatabaseConfigurationStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportMetaDataStatement.java similarity index 88% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportMetaDataStatement.java index 8094f031dbb84..3a91b812965e0 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportMetaDataStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportMetaDataStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportStorageNodesStatement.java similarity index 89% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportStorageNodesStatement.java index c41536a84c711..cb09ba2f2f289 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ExportStorageNodesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ExportStorageNodesStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeInfoStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeInfoStatement.java index fcda2a4539380..ba83aabb797d6 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeInfoStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeInfoStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show compute node info statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeModeStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeModeStatement.java index ba6c18b88ec8d..be52fa0a10f51 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodeModeStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodeModeStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show compute node mode statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodesStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodesStatement.java index 0f37b3d2e9c9f..19d22ea2ed97f 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowComputeNodesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowComputeNodesStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show compute nodes statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariableStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariableStatement.java index ed93fad3c863d..aae1d405c4438 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariableStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariableStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; /** * Show dist variable statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariablesStatement.java similarity index 88% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariablesStatement.java index 2ef8a11fbfd1a..3b434ac817b77 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowDistVariablesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowDistVariablesStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowMigrationRuleStatement.java similarity index 83% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowMigrationRuleStatement.java index b1d27e3590dfd..e01a6b8b8dacb 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowMigrationRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowMigrationRuleStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.QueryableMigrationRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.QueryableMigrationRALStatement; /** * Show migration rule statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowTableMetaDataStatement.java similarity index 90% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowTableMetaDataStatement.java index 8f9f1e6bce0ab..d0a555b30f0d0 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/queryable/ShowTableMetaDataStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/ShowTableMetaDataStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.queryable; +package org.apache.shardingsphere.distsql.statement.ral.queryable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterComputeNodeStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterComputeNodeStatement.java index 3a2f7b59f31ef..90d462419199a 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterComputeNodeStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterComputeNodeStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Alter compute node statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java similarity index 80% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java index 0b8b6db1aed9d..96d7836aa7c62 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/AlterInventoryIncrementalRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.InventoryIncrementalRuleSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; +import org.apache.shardingsphere.distsql.segment.InventoryIncrementalRuleSegment; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.migration.UpdatableMigrationRALStatement; /** * Alter inventory incremental rule statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportDatabaseConfigurationStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportDatabaseConfigurationStatement.java index 7298693990209..588da346b71e4 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportDatabaseConfigurationStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportDatabaseConfigurationStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Import database configuration statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportMetaDataStatement.java similarity index 89% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportMetaDataStatement.java index 2f065916e680b..55a6290b2797a 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/ImportMetaDataStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/ImportMetaDataStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LabelComputeNodeStatement.java similarity index 88% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LabelComputeNodeStatement.java index 738d12db4573a..aac5484103228 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LabelComputeNodeStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LabelComputeNodeStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import java.util.Collection; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LockClusterStatement.java similarity index 82% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LockClusterStatement.java index b1520eccc4bf3..ca42116bb0127 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/LockClusterStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/LockClusterStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Lock cluster statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java similarity index 89% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java index 9a3668a65e53f..fd6c325fdc5cf 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshDatabaseMetaDataStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshTableMetaDataStatement.java similarity index 91% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshTableMetaDataStatement.java index aeffc04eab197..b00f2d7986d08 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/RefreshTableMetaDataStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/RefreshTableMetaDataStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import java.util.Optional; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetDistVariableStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetDistVariableStatement.java index 87d0520da7647..1a5df7192eff2 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetDistVariableStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetDistVariableStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Set dist variable statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetInstanceStatusStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetInstanceStatusStatement.java index 6f751fbc22301..30d925968d699 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/SetInstanceStatusStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/SetInstanceStatusStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Set instance status statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlabelComputeNodeStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlabelComputeNodeStatement.java index 77f1260b35e05..76787cfef858f 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlabelComputeNodeStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlabelComputeNodeStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import java.util.Collection; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlockClusterStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlockClusterStatement.java index 5caad8d5b079b..c5a3e483c4461 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/UnlockClusterStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/updatable/UnlockClusterStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.ral.updatable; +package org.apache.shardingsphere.distsql.statement.ral.updatable; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; /** * Unlock cluster statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RDLStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RDLStatement.java index 5e954998f163a..b05bab9e1b146 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RDLStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RDLStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl; +package org.apache.shardingsphere.distsql.statement.rdl; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; /** * RDL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java index 42659168c246f..9f47d3e4cef9b 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/RuleDefinitionStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/RuleDefinitionStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl; +package org.apache.shardingsphere.distsql.statement.rdl; /** * Rule definition statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java similarity index 93% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java index 889021e438809..f8abfa6465629 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/StorageUnitDefinitionStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/StorageUnitDefinitionStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl; +package org.apache.shardingsphere.distsql.statement.rdl; /** * Storage unit definition statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java similarity index 85% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java index 2bf4373c3d848..1236c469b76e4 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterRuleStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.alter; +package org.apache.shardingsphere.distsql.statement.rdl.alter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; /** * Alter rule statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java similarity index 82% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java index 12e8de33a5bee..be0913ae2b402 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/alter/AlterStorageUnitStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/alter/AlterStorageUnitStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.alter; +package org.apache.shardingsphere.distsql.statement.rdl.alter; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.StorageUnitDefinitionStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement; import java.util.Collection; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java index c1055e809e184..1db3cacb7f0bf 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/CreateRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/CreateRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.create; +package org.apache.shardingsphere.distsql.statement.rdl.create; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; /** * Create rule statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java similarity index 83% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java index 36492c0b9735c..146c7855a0e90 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/create/RegisterStorageUnitStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/create/RegisterStorageUnitStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.create; +package org.apache.shardingsphere.distsql.statement.rdl.create; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.StorageUnitDefinitionStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement; import java.util.Collection; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java index 165cb1e5a14ac..bbbbdc463892c 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/DropRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.drop; +package org.apache.shardingsphere.distsql.statement.rdl.drop; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; /** * Drop rule statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java similarity index 89% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java index 9e0aad8859702..87f6a6a2dbdab 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/UnregisterStorageUnitStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rdl/drop/UnregisterStorageUnitStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rdl.drop; +package org.apache.shardingsphere.distsql.statement.rdl.drop; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.StorageUnitDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement; import java.util.Collection; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/RQLStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/RQLStatement.java index 886166ce47e57..052e22c44e107 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/RQLStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/RQLStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql; +package org.apache.shardingsphere.distsql.statement.rql; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; /** * RQL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowLogicalTablesStatement.java similarity index 94% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowLogicalTablesStatement.java index 6ec4dd8f3d759..eb7394619db8b 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowLogicalTablesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowLogicalTablesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql.show; +package org.apache.shardingsphere.distsql.statement.rql.show; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java similarity index 90% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java index 7118592150510..a6becff91b47e 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql.show; +package org.apache.shardingsphere.distsql.statement.rql.show; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java similarity index 95% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java index 7b5eeb5c28b08..f431ba2265e16 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowRulesUsedStorageUnitStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowRulesUsedStorageUnitStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql.show; +package org.apache.shardingsphere.distsql.statement.rql.show; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowStorageUnitsStatement.java similarity index 91% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowStorageUnitsStatement.java index 6dc6486812f33..44810ed34d30e 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowStorageUnitsStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowStorageUnitsStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql.show; +package org.apache.shardingsphere.distsql.statement.rql.show; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowTablesStatement.java similarity index 92% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowTablesStatement.java index b38e834d985af..b246b24c72c26 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rql/show/ShowTablesStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/show/ShowTablesStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rql.show; +package org.apache.shardingsphere.distsql.statement.rql.show; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.statement.available.FromDatabaseAvailable; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/RULStatement.java similarity index 86% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/RULStatement.java index 9082354c3b11d..0d2ce71d129e6 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/RULStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/RULStatement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rul; +package org.apache.shardingsphere.distsql.statement.rul; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; /** * RUL statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java similarity index 94% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java index 3408c794caf2d..dc5e0cdf0e9b0 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/SQLRULStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rul; +package org.apache.shardingsphere.distsql.statement.rul; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java index 292eeaaa02c75..7f69260629e1c 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/FormatStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rul.sql; +package org.apache.shardingsphere.distsql.statement.rul.sql; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement; +import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement; /** * Format statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java index ec14a135f0122..6c0c5b17560c3 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/ParseStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rul.sql; +package org.apache.shardingsphere.distsql.statement.rul.sql; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement; +import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement; /** * Parse statement. diff --git a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java similarity index 87% rename from parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java rename to parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java index 886f0f681a79f..6cee111a463f0 100644 --- a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rul/sql/PreviewStatement.java +++ b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.statement.rul.sql; +package org.apache.shardingsphere.distsql.statement.rul.sql; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement; +import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement; /** * Preview statement. diff --git a/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java b/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverterTest.java similarity index 89% rename from parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java rename to parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverterTest.java index 9c365cc88c1f0..794bdb36d4e6f 100644 --- a/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java +++ b/parser/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/segment/converter/DataSourceSegmentsConverterTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.distsql.parser.segment.converter; +package org.apache.shardingsphere.distsql.segment.converter; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/distsql/DistSQLStatementContext.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/distsql/DistSQLStatementContext.java index 2039b8f5c44a2..8f45565dda2fe 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/distsql/DistSQLStatementContext.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/distsql/DistSQLStatementContext.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; import org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java index 43d3d62112046..fa9aa2db00997 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java @@ -22,10 +22,10 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.authority.checker.AuthorityChecker; import org.apache.shardingsphere.authority.rule.AuthorityRule; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.engine.SQLBindEngine; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java index d53baee249455..be54345546698 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java @@ -19,11 +19,11 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.RALBackendHandlerFactory; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java index 1f11b4cfe73d9..0301278a50c7f 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java @@ -20,8 +20,8 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.ral.update.GlobalRuleRALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java index 198609bad5378..dac740ff42965 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandler.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.distsql.handler.ral.query.InstanceContextRequiredQueryableRALExecutor; import org.apache.shardingsphere.distsql.handler.ral.query.MetaDataRequiredQueryableRALExecutor; import org.apache.shardingsphere.distsql.handler.ral.query.QueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.infra.merge.result.MergedResult; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java index 9f67920d9323c..1453fa1e2c682 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java @@ -19,10 +19,10 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java index 410aa3e92527a..6e0fc5235090b 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java @@ -20,8 +20,8 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.ral.update.GlobalRuleRALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableRALBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableRALBackendHandler.java index 8f0e8f7922e31..7740d92ad7f07 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableRALBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableRALBackendHandler.java @@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.updater.ConnectionSessionRequiredRALUpdater; import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java index 2f8ad386508f4..a804b85f8e3a4 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.handler.ral.constant.DistSQLScriptConstants; import org.apache.shardingsphere.distsql.handler.ral.query.ConvertRuleConfigurationProvider; import org.apache.shardingsphere.distsql.handler.ral.query.QueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ConvertYamlConfigurationStatement; import org.apache.shardingsphere.encrypt.api.config.CompatibleEncryptRuleConfiguration; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java index 46e0622635d4f..d2204522eea73 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.DatabaseRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportDatabaseConfigurationStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.proxy.backend.util.ExportUtils; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java index a85a5e712fa28..3f41820f9d9ff 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java @@ -19,7 +19,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.shardingsphere.distsql.handler.ral.query.MetaDataRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportMetaDataStatement; import org.apache.shardingsphere.globalclock.core.provider.GlobalClockProvider; import org.apache.shardingsphere.globalclock.core.rule.GlobalClockRule; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java index dd85561b8baaa..fa7930fc26e58 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.MetaDataRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportStorageNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportStorageNodesStatement; import org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties; import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java index 8cdd80dc5c742..3b776a258e9cc 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.InstanceContextRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeInfoStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeInfoStatement; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java index 9d1cae30ad044..c0a7b61322d60 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.InstanceContextRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeModeStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeModeStatement; import org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java index d96f620f9a790..8022eb46be404 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.InstanceContextRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodesStatement; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java index c0a3c7662e9c0..cafc1b18544f9 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java index a42299061ff8d..bbb9f5c884908 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariablesStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java index d7aaab03e55ad..ffb025ccbe852 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.InventoryIncrementalJobAPI; import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobAPI; import org.apache.shardingsphere.distsql.handler.ral.query.QueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowMigrationRuleStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowMigrationRuleStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.infra.util.json.JsonUtils; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java index 96d2f86b41ab0..3c82b114ab9ec 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import org.apache.shardingsphere.distsql.handler.ral.query.DatabaseRequiredQueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/executor/ConnectionSessionRequiredQueryableRALExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/executor/ConnectionSessionRequiredQueryableRALExecutor.java index 9d2e088986c0f..01f474e034bbe 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/executor/ConnectionSessionRequiredQueryableRALExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/executor/ConnectionSessionRequiredQueryableRALExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.executor; import org.apache.shardingsphere.distsql.handler.ral.query.QueryableRALExecutor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalRuleUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalRuleUpdater.java index 6274fecc58b05..c4e277cc2d2d0 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalRuleUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterInventoryIncrementalRuleUpdater.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.InventoryIncrementalJobAPI; import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobAPI; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterInventoryIncrementalRuleStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.AlterInventoryIncrementalRuleStatement; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.converter.InventoryIncrementalProcessConfigurationSegmentConverter; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdater.java index 2d6d3329e2f40..f596725e72e25 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConfiguration; import org.apache.shardingsphere.proxy.backend.exception.FileIOException; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java index 3dc8526d89fc4..e7f984ec70da2 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdater.java @@ -20,7 +20,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.util.json.JsonUtils; import org.apache.shardingsphere.infra.util.yaml.YamlEngine; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdater.java index 176523055932c..4e96f5d98dbf7 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LabelComputeNodeStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdater.java index 233b77ad33de8..731af7d2297fc 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdater.java @@ -21,7 +21,7 @@ import lombok.Setter; import org.apache.shardingsphere.distsql.handler.exception.algorithm.MissingRequiredAlgorithmException; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.lock.GlobalLockNames; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java index 6ec883ba35db2..d73f2bc6c4c00 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshDatabaseMetaDataStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdater.java index de0f73f6dc265..82c55c41fea77 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdater.java @@ -20,7 +20,7 @@ import com.google.common.base.Strings; import org.apache.shardingsphere.distsql.handler.exception.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdater.java index d5c12cbad2b36..f65f4468a9a37 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdater.java @@ -20,7 +20,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey; import org.apache.shardingsphere.infra.props.TypedPropertyKey; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdater.java index 658b7a167305f..b6854ac92e299 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInstanceStatusStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetInstanceStatusStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.state.instance.InstanceState; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdater.java index 2873f5c2a741c..f8791fb7e8acb 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.instance.ComputeNodeInstance; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdater.java index a2de537cf3d7c..dc189be355d6e 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdater.java @@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.lock.GlobalLockNames; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java index 4e98a8bcb3b7c..e6c07cfd84e6a 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/converter/InventoryIncrementalProcessConfigurationSegmentConverter.java @@ -22,9 +22,9 @@ import org.apache.shardingsphere.data.pipeline.common.config.process.PipelineProcessConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.process.PipelineReadConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.process.PipelineWriteConfiguration; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.segment.InventoryIncrementalRuleSegment; -import org.apache.shardingsphere.distsql.parser.segment.ReadOrWriteSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.InventoryIncrementalRuleSegment; +import org.apache.shardingsphere.distsql.segment.ReadOrWriteSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; /** diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java index bcf6ec31877a4..8c8d2e50c6044 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandler.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java index a5a96aaaf0225..85a1941a444a8 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java @@ -19,12 +19,12 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.StorageUnitDefinitionStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.NewRuleDefinitionBackendHandler; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java index fae9304bb3ecb..5bb10ccf26db4 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionDropUpdater; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionUpdater; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.config.rule.decorator.RuleConfigurationDecorator; import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java index 652444088b4b9..7011887811880 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionDropUpdater; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionUpdater; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.infra.config.rule.decorator.RuleConfigurationDecorator; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandler.java index 240b719f0b9be..33f9a1b3a30c2 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandler.java @@ -22,11 +22,11 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.converter.DataSourceSegmentsConverter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; import org.apache.shardingsphere.infra.database.core.connector.url.JdbcUrl; import org.apache.shardingsphere.infra.database.core.connector.url.StandardJdbcUrlParser; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandler.java index 6aade316f1eb8..3e15a31b3cea8 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandler.java @@ -21,9 +21,9 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.DuplicateStorageUnitException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.converter.DataSourceSegmentsConverter; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.converter.DataSourceSegmentsConverter; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/StorageUnitDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/StorageUnitDefinitionBackendHandler.java index 1c618377f0588..9b4d3af9ebf80 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/StorageUnitDefinitionBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/StorageUnitDefinitionBackendHandler.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.storage.unit; -import org.apache.shardingsphere.distsql.parser.statement.rdl.StorageUnitDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.StorageUnitDefinitionStatement; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.RDLBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java index fe660f97f4392..860aaae247123 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandler.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.StorageUnitInUsedException; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.exception.core.external.server.ShardingSphereServerException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java index 9871323f850fc..951b297f6bf19 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandler.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.infra.merge.result.MergedResult; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java index 85b581b52b472..8d1105994479a 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RQLBackendHandlerFactory.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java index c6997642d74e3..a560eed97735e 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowLogicalTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowLogicalTablesStatement; import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java index b1481fa8f3389..ea9afaca69cb3 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesUsedStorageUnitStatement; import org.apache.shardingsphere.encrypt.api.config.CompatibleEncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.rule.EncryptRule; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java index 50e7185d473d1..85f16ba3c1750 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.storage.unit; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandler.java index 8ed9167810029..369953b72c988 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandler.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul; import lombok.Getter; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java index 8dcd621d60f28..45447a4c926f1 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java index c7217f90fbe28..66edb10778f3f 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul; import org.apache.shardingsphere.distsql.handler.rul.RULExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.infra.merge.result.MergedResult; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java index 5436b0f015513..2c83ac9529649 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor; import org.apache.shardingsphere.distsql.handler.rul.RULExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java index aed4eea9b8bbc..0ccf8cfb12a4c 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java index bf8b86b200df3..6bd8f3699053e 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.util.json.JsonUtils; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java index 08240d538b061..25b52a58d7da1 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement; import org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java index b8cb2c49d347e..d3412b656bd32 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.proxy.backend.state.impl; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlockClusterStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.proxy.backend.exception.ReadOnlyException; import org.apache.shardingsphere.proxy.backend.state.ProxyClusterState; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java index 4fbb3ab0d7b28..13b8b91903364 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.proxy.backend.state.impl; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlockClusterStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.proxy.backend.exception.UnavailableException; import org.apache.shardingsphere.proxy.backend.state.ProxyClusterState; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java index 2dbc999375713..e0bf70be634d9 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.instance.mode.ModeContextManager; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java index 7140fc6561fcb..f5e6e4f65eca0 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/CreateFixtureRuleStatement.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.fixture; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; public final class CreateFixtureRuleStatement extends CreateRuleStatement { } diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java index 217977b64da79..33abb0096776a 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java index d1e43bc5fbb76..0d0e9124fcaa6 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutorTest.java @@ -20,7 +20,7 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import lombok.SneakyThrows; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ConvertYamlConfigurationStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java index 910b645016fe0..06a4d8233161d 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; import lombok.SneakyThrows; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportDatabaseConfigurationStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java index db463f11fc989..6a5cf996dc87e 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java @@ -20,7 +20,7 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportMetaDataStatement; import org.apache.shardingsphere.globalclock.core.rule.GlobalClockRule; import org.apache.shardingsphere.globalclock.core.rule.builder.DefaultGlobalClockRuleConfigurationBuilder; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java index 4deba8a34a13c..b69d083731643 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java @@ -20,7 +20,7 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.authority.rule.builder.DefaultAuthorityRuleConfigurationBuilder; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportStorageNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportStorageNodesStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; 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/queryable/ShowComputeNodeInfoExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutorTest.java index 6e28372dfc4ef..48fec3c79c26f 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodesStatement; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData; @@ -26,7 +26,6 @@ import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepositoryConfiguration; import org.junit.jupiter.api.Test; -import java.sql.SQLException; import java.util.Collection; import java.util.Iterator; import java.util.Properties; @@ -56,7 +55,7 @@ void assertGetColumns() { } @Test - void assertExecute() throws SQLException { + void assertExecute() { ShowComputeNodesExecutor executor = new ShowComputeNodesExecutor(); Collection actual = executor.getRows(createInstanceContext(), mock(ShowComputeNodesStatement.class)); assertThat(actual.size(), is(1)); diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutorTest.java index 68958ba3f4285..e4a46e158efff 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeModeStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeModeStatement; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; @@ -26,7 +26,6 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; -import java.sql.SQLException; import java.util.Collection; import java.util.Iterator; @@ -39,7 +38,7 @@ class ShowComputeNodeModeExecutorTest { @Test - void assertExecute() throws SQLException { + void assertExecute() { ShowComputeNodeModeExecutor executor = new ShowComputeNodeModeExecutor(); Collection actual = executor.getRows(createInstanceContext(), new ShowComputeNodeModeStatement()); assertThat(actual.size(), is(1)); diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutorTest.java index d5414c855db98..cbc97729ac1f5 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodesStatement; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; import org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration; 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/ShowDistVariableExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutorTest.java index 1a439bc4882e4..ffb2a59d98bd2 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties; 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/ShowDistVariablesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutorTest.java index fd80794737d91..7985433036644 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariablesStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationProperties; 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/ShowTableMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java index 730e357494e51..60ff4d6670882 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdaterTest.java index 44ac26d42e6b7..561df445c2855 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationUpdaterTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.handler.exception.datasource.MissingRequiredDataSourcesException; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.database.core.DefaultDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java index 7aaac35296ae5..a8835f8cf19d1 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.distsql.handler.exception.datasource.MissingRequiredDataSourcesException; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.database.core.DefaultDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdaterTest.java index ccd3d69c851b4..92fa18d563cdd 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LabelComputeNodeStatement; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdaterTest.java index 104b484e47b01..ae68b4b225436 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterUpdaterTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LockClusterStatement; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement; import org.apache.shardingsphere.infra.state.cluster.ClusterState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java index 3e961bf79a822..e36bf0d9f1341 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshDatabaseMetaDataStatement; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.test.mock.AutoMockExtension; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java index 0e0866a33f340..727045e113a4d 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetaDataUpdaterTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.EmptyStorageUnitException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException; import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java index 515b51b495e07..69ee52a6d151d 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdatableRALBackendHandlerTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; import io.netty.util.DefaultAttributeMap; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType; import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java index 1fb53f570b579..9168951fcf30d 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdaterTest.java index 325789b28315e..539d4bb50fe63 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetInstanceStatusUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetInstanceStatusStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetInstanceStatusStatement; import org.apache.shardingsphere.infra.state.instance.InstanceState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdaterTest.java index e6f939139f48b..71d05d19010c8 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdaterTest.java index 769f7329c553f..32bb2147bfacd 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterUpdaterTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement; import org.apache.shardingsphere.infra.state.cluster.ClusterState; import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java index d7375cc04d165..b1cd46111e149 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactoryTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rdl; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.RuleDefinitionBackendHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.storage.unit.AlterStorageUnitBackendHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.storage.unit.RegisterStorageUnitBackendHandler; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java index 5e05dc4e79d79..f2b110cee247c 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/AlterStorageUnitBackendHandlerTest.java @@ -22,10 +22,10 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java index 1fb0d6d283787..4af2f7b662442 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/RegisterStorageUnitBackendHandlerTest.java @@ -20,10 +20,10 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.DuplicateStorageUnitException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException; import org.apache.shardingsphere.distsql.handler.validate.DataSourcePoolPropertiesValidateHandler; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandlerTest.java index cee1acd14c6ec..9d67cb792ec69 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/storage/unit/UnregisterStorageUnitBackendHandlerTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.handler.exception.storageunit.MissingRequiredStorageUnitsException; import org.apache.shardingsphere.distsql.handler.exception.storageunit.StorageUnitInUsedException; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.category.DistSQLException; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutorTest.java index bde6a6519b9fe..bb389793ddedf 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowLogicalTableExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowLogicalTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowLogicalTablesStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutorTest.java index b6057312da853..c91dc9e12b318 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowRulesUsedStorageUnitExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesUsedStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesUsedStorageUnitStatement; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.rule.EncryptRule; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutorTest.java index 4491dc5d76a8e..b0dbe7c6db139 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.storage.unit; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.infra.instance.InstanceContext; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java index 9849726a96a59..2a0f07885d342 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java index a0b52f7342b29..69f7e0e9d07f6 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java index dc58bdb8086f8..427f5c0c227c2 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.proxy.backend.state.impl; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; import org.apache.shardingsphere.proxy.backend.exception.UnavailableException; import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatement; import org.junit.jupiter.api.Test; diff --git a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java index edac18be14e55..f3711187ceca3 100644 --- a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java +++ b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.AnalyzeTableStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.ResetParameterStatement; diff --git a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java index e580410f307ec..a03a3e9a3a8f6 100644 --- a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java +++ b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.PostgreSQLColumnType; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.parse.PostgreSQLComParsePacket; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.parse.PostgreSQLParseCompletePacket; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext; import org.apache.shardingsphere.infra.binder.engine.SQLBindEngine; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java index 8b92f9800b9e9..fa8cfde78ce56 100644 --- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java +++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.proxy.frontend.postgresql.command.query; -import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.DistSQLStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.AnalyzeTableStatement; diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java index 8e99c4e958b02..8ba8d60d5c4f4 100644 --- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java +++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutorTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.PostgreSQLColumnType; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.parse.PostgreSQLComParsePacket; import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.parse.PostgreSQLParseCompletePacket; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; import org.apache.shardingsphere.infra.binder.context.statement.CommonSQLStatementContext; import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java index 3bedd36330f87..954fc052b4ef5 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/SQLCommandType.java @@ -19,9 +19,9 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement; diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java index 36a335c503c06..af2fe6a5f7574 100644 --- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java +++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterGenerator.java @@ -20,8 +20,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AlgorithmAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AlgorithmAssert.java index 730d000d4726e..75799b4461902 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AlgorithmAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AlgorithmAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedAlgorithm; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DataSourceAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DataSourceAssert.java index dbe2a4661d22b..770c279739033 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DataSourceAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/DataSourceAssert.java @@ -19,9 +19,9 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.HostnameAndPortBasedDataSourceSegment; -import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.HostnameAndPortBasedDataSourceSegment; +import org.apache.shardingsphere.distsql.segment.URLBasedDataSourceSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedDataSource; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java index 59a1b9b3e85d5..dc963bfa66766 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.PropertiesAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/SQLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/SQLStatementAssert.java index c49ac7d03d7a0..95a5018c5ccd7 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/SQLStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/SQLStatementAssert.java @@ -19,10 +19,10 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/RALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/RALStatementAssert.java index 4439d2dd30964..c9a3a844bcfe8 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/RALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/RALStatementAssert.java @@ -19,11 +19,11 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.QueryablePipelineRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.UpdatablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.RALStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.QueryablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.UpdatablePipelineRALStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.pipeline.QueryablePipelineRALStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.pipeline.UpdatablePipelineRALStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java index 0bf0798680933..d149c6dae724b 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java @@ -20,17 +20,17 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportStorageNodesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeInfoStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodeModeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowComputeNodesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ConvertYamlConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ExportStorageNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeInfoStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodeModeStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowComputeNodesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariablesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; import org.apache.shardingsphere.sqltranslator.distsql.statement.ShowSQLTranslatorRuleStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java index 08b9c19fb0b76..1edd498348067 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java @@ -19,15 +19,15 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterComputeNodeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LockClusterStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.AlterComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement; import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/QueryablePipelineRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/QueryablePipelineRALStatementAssert.java index d2f92a52980cb..987af395a119f 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/QueryablePipelineRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/QueryablePipelineRALStatementAssert.java @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.cdc.distsql.statement.ShowStreamingListStatement; import org.apache.shardingsphere.cdc.distsql.statement.ShowStreamingStatusStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.QueryablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.QueryablePipelineRALStatement; import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationCheckAlgorithmsStatement; import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationCheckStatusStatement; import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationListStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/UpdatablePipelineRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/UpdatablePipelineRALStatementAssert.java index b7ddd0b156036..e6cf857665116 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/UpdatablePipelineRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/UpdatablePipelineRALStatementAssert.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.cdc.distsql.statement.DropStreamingStatement; -import org.apache.shardingsphere.distsql.parser.statement.ral.pipeline.UpdatablePipelineRALStatement; +import org.apache.shardingsphere.distsql.statement.ral.pipeline.UpdatablePipelineRALStatement; import org.apache.shardingsphere.migration.distsql.statement.CheckMigrationStatement; import org.apache.shardingsphere.migration.distsql.statement.CommitMigrationStatement; import org.apache.shardingsphere.migration.distsql.statement.MigrateTableStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/CheckMigrationStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/CheckMigrationStatementAssert.java index cb296866c2cab..9175df31cb941 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/CheckMigrationStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/CheckMigrationStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.migration.distsql.statement.CheckMigrationStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/RegisterMigrationSourceStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/RegisterMigrationSourceStorageUnitStatementAssert.java index 999940372cbe4..022e7af15409c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/RegisterMigrationSourceStorageUnitStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/pipeline/migration/update/RegisterMigrationSourceStorageUnitStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; import org.apache.shardingsphere.migration.distsql.statement.RegisterMigrationSourceStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.DataSourceAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ConvertYamlConfigurationStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ConvertYamlConfigurationStatementAssert.java index eed18b97508f3..9b9232575bef6 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ConvertYamlConfigurationStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ConvertYamlConfigurationStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ConvertYamlConfigurationStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ConvertYamlConfigurationStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariableStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariableStatementAssert.java index 52c4fe02f87d3..44d4225e63988 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariableStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariableStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariableStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowDistVariableStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariablesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariablesStatementAssert.java index 0f336756907b9..ad40b756ae0da 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariablesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowDistVariablesStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowDistVariablesStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowDistVariablesStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java index ea886d6312b5f..233cc689e40ff 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.queryable.ShowTableMetaDataStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterComputeNodeStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterComputeNodeStatementAssert.java index 45cdf52209aa5..5e45e7307b21e 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterComputeNodeStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterComputeNodeStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.AlterComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.AlterComputeNodeStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterComputeNodeStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportDatabaseConfigurationStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportDatabaseConfigurationStatementAssert.java index 73aca5c6c4832..596cc359c5b00 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportDatabaseConfigurationStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportDatabaseConfigurationStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportDatabaseConfigurationStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportMetaDataStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportMetaDataStatementAssert.java index cde22a8cb9722..7cf4a7a73a190 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportMetaDataStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/ImportMetaDataStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.ImportMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportMetaDataStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LabelComputeNodeStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LabelComputeNodeStatementAssert.java index f2973fb60dd6b..b521a24317ab0 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LabelComputeNodeStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LabelComputeNodeStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LabelComputeNodeStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java index fadb898e5aa15..0fdf1f59ac3f5 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.LockClusterStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LockClusterStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java index 139854e486185..10834ee6f2897 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/RefreshTableMetaDataStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/SetDistVariableStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/SetDistVariableStatementAssert.java index 40f459ebdc395..3b676e65ea782 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/SetDistVariableStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/SetDistVariableStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/UnlabelComputeNodeStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/UnlabelComputeNodeStatementAssert.java index b6e30ee1008a7..c93961c0d211d 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/UnlabelComputeNodeStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/UnlabelComputeNodeStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; +import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java index a433c852ff305..5472ae9341853 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java @@ -19,13 +19,13 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterRuleStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterStorageUnitStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java index 3507fbdbeb10b..4206145c4cbbb 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterRuleStatement; import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java index 3e37568c468ef..c2726a70263e7 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterStorageUnitStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.alter.AlterStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.DataSourceAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedDataSource; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java index 3ef0faaeb54dc..637c4b381b3bd 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatement; import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java index 0bee5e15891f9..78271897c9934 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/RegisterStorageUnitStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment; -import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.segment.DataSourceSegment; +import org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.DataSourceAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedDataSource; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java index 9efd94a15651c..353750af0ff1b 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement; import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java index 5f414e3d29fad..9adf88b1c843e 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/UnregisterStorageUnitStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.UnregisterStorageUnitStatement; +import org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.UnregisterStorageUnitStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java index 098f41256b7d3..abb4f812a91b0 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/RQLStatementAssert.java @@ -19,10 +19,10 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.RQLStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowTablesStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rql.impl.ShowRulesStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rql.impl.ShowStorageUnitsStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java index 3cc6f7d61fd50..1d8e4aa09d40e 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DatabaseContainedTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java index ce8b37fff5571..d6be575afa0e7 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java index 85f9d1dcefa8a..4ba0499128abc 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowTablesStatement; +import org.apache.shardingsphere.distsql.statement.rql.show.ShowTablesStatement; import org.apache.shardingsphere.single.distsql.statement.rql.ShowSingleTableStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java index ce7124bf159af..cbfcecb0474ef 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement; +import org.apache.shardingsphere.distsql.statement.rul.RULStatement; +import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.SQLRULStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java index bad5da2f4cdc0..3f840e62d13a4 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java @@ -19,10 +19,10 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.SQLRULStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement; +import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql.FormatSQLStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql.ParseStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java index 3fd93b2894db7..a639e99514cfe 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.FormatSQLStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java index bb7e6139b5238..f1798d1c1499b 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.ParseStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java index 7875168dec8a9..51688532b2769 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement; +import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.PreviewStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LockClusterStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LockClusterStatementTestCase.java index 57c3362a90ff9..b03332d14a657 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LockClusterStatementTestCase.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ral/LockClusterStatementTestCase.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; +import org.apache.shardingsphere.distsql.segment.AlgorithmSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase; import javax.xml.bind.annotation.XmlElement;