This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2419f83d6e4 Refactor HintRALStatement and HintRALStatementExecutor
(#19075)
2419f83d6e4 is described below
commit 2419f83d6e4df3abbdc907fbf8464e1792b5c9a7
Author: Raigor <[email protected]>
AuthorDate: Wed Jul 13 08:04:06 2022 +0800
Refactor HintRALStatement and HintRALStatementExecutor (#19075)
---
.../core/common/CommonDistSQLStatementVisitor.java | 2 +-
.../statement/ral/AdvancedDistSQLStatement.java | 24 ---------
...mmonRALStatement.java => HintRALStatement.java} | 4 +-
.../statement/ral/common/HintDistSQLStatement.java | 26 ---------
.../ral/{common => }/hint/ClearHintStatement.java | 6 +--
.../hint/ClearReadwriteSplittingHintStatement.java | 4 +-
.../hint/SetReadwriteSplittingHintStatement.java | 4 +-
.../ShowReadwriteSplittingHintStatusStatement.java | 4 +-
.../AddShardingHintDatabaseValueStatement.java | 4 +-
.../hint/AddShardingHintTableValueStatement.java | 4 +-
.../statement/hint/ClearShardingHintStatement.java | 4 +-
.../SetShardingHintDatabaseValueStatement.java | 4 +-
.../hint/ShowShardingHintStatusStatement.java | 4 +-
.../text/distsql/ral/RALBackendHandlerFactory.java | 8 +--
.../ral/{common => }/hint/HintManagerHolder.java | 2 +-
.../HintRALBackendHandler.java} | 24 ++++-----
.../HintRALStatementExecutor.java} | 10 ++--
.../HintRALStatementExecutorFactory.java} | 36 ++++++-------
.../hint => hint/enums}/HintShardingType.java | 2 +-
.../hint => hint/enums}/HintSourceType.java | 2 +-
.../hint/executor/AbstractHintQueryExecutor.java | 8 +--
.../hint/executor/AbstractHintUpdateExecutor.java | 8 +--
.../AddShardingHintDatabaseValueExecutor.java | 4 +-
.../AddShardingHintTableValueExecutor.java | 4 +-
.../hint/executor/ClearHintExecutor.java | 6 +--
.../ClearReadwriteSplittingHintExecutor.java | 4 +-
.../hint/executor/ClearShardingHintExecutor.java | 4 +-
.../SetReadwriteSplittingHintExecutor.java | 6 +--
.../SetShardingHintDatabaseValueExecutor.java | 4 +-
.../ShowReadwriteSplittingHintStatusExecutor.java | 4 +-
.../executor/ShowShardingHintStatusExecutor.java | 6 +--
.../hint/result/ShowShardingHintStatusResult.java | 2 +-
.../TextProtocolBackendHandlerFactoryTest.java | 4 +-
...va => HintRALStatementExecutorFactoryTest.java} | 61 +++++++++++-----------
34 files changed, 126 insertions(+), 177 deletions(-)
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
index 6d2bd29faaf..6a5e6fd5a87 100644
---
a/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
+++
b/shardingsphere-distsql/shardingsphere-distsql-parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/common/CommonDistSQLStatementVisitor.java
@@ -81,7 +81,7 @@ import
org.apache.shardingsphere.distsql.parser.segment.CacheOptionSegment;
import org.apache.shardingsphere.distsql.parser.segment.DataSourceSegment;
import org.apache.shardingsphere.distsql.parser.segment.TrafficRuleSegment;
import
org.apache.shardingsphere.distsql.parser.segment.TransactionProviderSegment;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.hint.ClearHintStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.hint.ClearHintStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ExportDatabaseConfigurationStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ShowAuthorityRuleStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ShowInstanceModeStatement;
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
deleted file mode 100644
index 21a831c9324..00000000000
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/AdvancedDistSQLStatement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.distsql.parser.statement.ral;
-
-/**
- * Advanced Dist SQL statement.
- */
-public abstract class AdvancedDistSQLStatement extends RALStatement {
-}
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/CommonRALStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/HintRALStatement.java
similarity index 90%
rename from
shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/CommonRALStatement.java
rename to
shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/HintRALStatement.java
index 68b35be9b20..0a7a30b4087 100644
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/CommonRALStatement.java
+++
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/HintRALStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.distsql.parser.statement.ral;
/**
- * Common RAL statement.
+ * Hint RAL statement.
*/
-public abstract class CommonRALStatement extends RALStatement {
+public abstract class HintRALStatement extends RALStatement {
}
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/HintDistSQLStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/HintDistSQLStatement.java
deleted file mode 100644
index 22debd3cde4..00000000000
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/HintDistSQLStatement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.distsql.parser.statement.ral.common;
-
-import
org.apache.shardingsphere.distsql.parser.statement.ral.CommonRALStatement;
-
-/**
- * Hint Dist SQL statement.
- */
-public abstract class HintDistSQLStatement extends CommonRALStatement {
-}
diff --git
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/hint/ClearHintStatement.java
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/hint/ClearHintStatement.java
similarity index 78%
rename from
shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/hint/ClearHintStatement.java
rename to
shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/hint/ClearHintStatement.java
index f203e99d8e8..95c7776338a 100644
---
a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/hint/ClearHintStatement.java
+++
b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/hint/ClearHintStatement.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.parser.statement.ral.common.hint;
+package org.apache.shardingsphere.distsql.parser.statement.ral.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Clear hint statement.
*/
-public final class ClearHintStatement extends HintDistSQLStatement {
+public final class ClearHintStatement extends HintRALStatement {
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ClearReadwriteSplittingHintStatement.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphe
[...]
index bb12bafccd7..70dd8c72b64 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ClearReadwriteSplittingHintStatement.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ClearReadwriteSplittingHintStatement.java
@@ -17,10 +17,10 @@
package
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Clear readwrite-splitting hint statement.
*/
-public final class ClearReadwriteSplittingHintStatement extends
HintDistSQLStatement {
+public final class ClearReadwriteSplittingHintStatement extends
HintRALStatement {
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/SetReadwriteSplittingHintStatement.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere
[...]
index 181d32fcf00..5b199cd0877 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/SetReadwriteSplittingHintStatement.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/SetReadwriteSplittingHintStatement.java
@@ -19,14 +19,14 @@ package
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hi
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Set readwrite-splitting hint statement.
*/
@RequiredArgsConstructor
@Getter
-public final class SetReadwriteSplittingHintStatement extends
HintDistSQLStatement {
+public final class SetReadwriteSplittingHintStatement extends HintRALStatement
{
private final String source;
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ShowReadwriteSplittingHintStatusStatement.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardin
[...]
index b3102429b3f..1d5514e5876 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ShowReadwriteSplittingHintStatusStatement.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/hint/ShowReadwriteSplittingHintStatusStatement.java
@@ -17,10 +17,10 @@
package
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Show readwrite-splitting hint status statement.
*/
-public final class ShowReadwriteSplittingHintStatusStatement extends
HintDistSQLStatement {
+public final class ShowReadwriteSplittingHintStatusStatement extends
HintRALStatement {
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintDatabaseValueStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintDatabaseValueState
[...]
index c9efae23fee..38771e2927d 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintDatabaseValueStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintDatabaseValueStatement.java
@@ -19,14 +19,14 @@ package
org.apache.shardingsphere.sharding.distsql.parser.statement.hint;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Add sharding hint database value statement.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingHintDatabaseValueStatement extends
HintDistSQLStatement {
+public final class AddShardingHintDatabaseValueStatement extends
HintRALStatement {
private final String logicTableName;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintTableValueStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintTableValueStatement.java
index 60ba4421afc..4dec49ccfd7 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintTableValueStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/AddShardingHintTableValueStatement.java
@@ -19,14 +19,14 @@ package
org.apache.shardingsphere.sharding.distsql.parser.statement.hint;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Add sharding hint table value statement.
*/
@RequiredArgsConstructor
@Getter
-public final class AddShardingHintTableValueStatement extends
HintDistSQLStatement {
+public final class AddShardingHintTableValueStatement extends HintRALStatement
{
private final String logicTableName;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ClearShardingHintStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ClearShardingHintStatement.java
index 018ed1f8737..8acca331d97 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ClearShardingHintStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ClearShardingHintStatement.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Clear sharding hint statement.
*/
-public final class ClearShardingHintStatement extends HintDistSQLStatement {
+public final class ClearShardingHintStatement extends HintRALStatement {
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/SetShardingHintDatabaseValueStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/SetShardingHintDatabaseValueState
[...]
index 1c74ea6401b..d7a7206b8b6 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/SetShardingHintDatabaseValueStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/SetShardingHintDatabaseValueStatement.java
@@ -19,14 +19,14 @@ package
org.apache.shardingsphere.sharding.distsql.parser.statement.hint;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Set sharding hint database value statement.
*/
@RequiredArgsConstructor
@Getter
-public final class SetShardingHintDatabaseValueStatement extends
HintDistSQLStatement {
+public final class SetShardingHintDatabaseValueStatement extends
HintRALStatement {
private final String shardingValue;
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ShowShardingHintStatusStatement.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ShowShardingHintStatusStatement.java
index ca7fc843c27..6c2d4fbff58 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ShowShardingHintStatusStatement.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/hint/ShowShardingHintStatusStatement.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
/**
* Show sharding hint status statement.
*/
-public final class ShowShardingHintStatusStatement extends
HintDistSQLStatement {
+public final class ShowShardingHintStatusStatement extends HintRALStatement {
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
index 4a525e24f22..f864f64a35f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.advanced.FormatStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.advanced.ParseStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.advanced.PreviewStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ExportDatabaseConfigurationStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ShowAuthorityRuleStatement;
import
org.apache.shardingsphere.distsql.parser.statement.ral.common.queryable.ShowInstanceModeStatement;
@@ -54,7 +54,7 @@ import
org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.advanced.FormatSQLHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.advanced.ParseDistSQLHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.advanced.PreviewHandler;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.HintDistSQLBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.queryable.ExportDatabaseConfigurationHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.queryable.ShowAuthorityRuleHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.queryable.ShowInstanceHandler;
@@ -138,8 +138,8 @@ public final class RALBackendHandlerFactory {
* @throws SQLException SQL exception
*/
public static TextProtocolBackendHandler newInstance(final RALStatement
sqlStatement, final ConnectionSession connectionSession) throws SQLException {
- if (sqlStatement instanceof HintDistSQLStatement) {
- return new HintDistSQLBackendHandler((HintDistSQLStatement)
sqlStatement, connectionSession);
+ if (sqlStatement instanceof HintRALStatement) {
+ return new HintRALBackendHandler((HintRALStatement) sqlStatement,
connectionSession);
}
if (sqlStatement instanceof QueryableScalingRALStatement) {
return new QueryableScalingRALBackendHandler(sqlStatement,
connectionSession,
QueryableScalingRALBackendHandlerFactory.newInstance((QueryableScalingRALStatement)
sqlStatement));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintManagerHolder.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintManagerHolder.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintManagerHolder.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintManagerHolder.java
index 4ba956b9920..e90b8560ae0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintManagerHolder.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintManagerHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/HintDistSQLBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALBackendHandler.java
similarity index 71%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/HintDistSQLBackendHandler.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALBackendHandler.java
index 6d2bbbed981..c40df5055fc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/HintDistSQLBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALBackendHandler.java
@@ -15,51 +15,49 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintStatementExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintStatementExecutorFactory;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.RALBackendHandler;
import java.sql.SQLException;
/**
- * Hint dist sql backend handler.
+ * Hint RAL backend handler.
*/
@RequiredArgsConstructor
@Getter
-public final class HintDistSQLBackendHandler implements
TextProtocolBackendHandler {
+public final class HintRALBackendHandler extends RALBackendHandler {
- private final HintDistSQLStatement sqlStatement;
+ private final HintRALStatement sqlStatement;
private final ConnectionSession connectionSession;
- private HintStatementExecutor<? extends HintDistSQLStatement>
hintStatementExecutor;
+ private HintRALStatementExecutor<? extends HintRALStatement>
hintRALStatementExecutor;
@Override
public ResponseHeader execute() throws SQLException {
if
(!ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.PROXY_HINT_ENABLED))
{
throw new UnsupportedOperationException(String.format("%s should
be true, please check your config",
ConfigurationPropertyKey.PROXY_HINT_ENABLED.getKey()));
}
- hintStatementExecutor =
HintStatementExecutorFactory.newInstance(sqlStatement, connectionSession);
- return hintStatementExecutor.execute();
+ hintRALStatementExecutor =
HintRALStatementExecutorFactory.newInstance(sqlStatement, connectionSession);
+ return hintRALStatementExecutor.execute();
}
@Override
public boolean next() throws SQLException {
- return hintStatementExecutor.next();
+ return hintRALStatementExecutor.next();
}
@Override
public QueryResponseRow getRowData() throws SQLException {
- return hintStatementExecutor.getQueryResponseRow();
+ return hintRALStatementExecutor.getQueryResponseRow();
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutor.java
similarity index 86%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutor.java
index d2009ad72ce..f86fd997322 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutor.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import java.sql.SQLException;
/**
- * Hint statement executor.
+ * Hint RAL statement executor.
*/
-public interface HintStatementExecutor<T extends HintDistSQLStatement> {
+public interface HintRALStatementExecutor<T extends HintRALStatement> {
/**
- * Execute hint statement.
+ * Execute hint RAL statement.
*
* @return backend response
*/
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutorFactory.java
similarity index 79%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactory.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutorFactory.java
index 8ba62050988..4718d727bad 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/HintRALStatementExecutorFactory.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.hint.ClearHintStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.hint.ClearHintStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.AddShardingHintDatabaseValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.AddShardingHintTableValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearReadwriteSplittingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearShardingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.SetReadwriteSplittingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.SetShardingHintDatabaseValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ShowReadwriteSplittingHintStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ShowShardingHintStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.AddShardingHintDatabaseValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.AddShardingHintTableValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearReadwriteSplittingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearShardingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.SetReadwriteSplittingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.SetShardingHintDatabaseValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ShowReadwriteSplittingHintStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ShowShardingHintStatusExecutor;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ClearReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.SetReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
@@ -43,20 +43,20 @@ import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.ShowShar
import java.sql.SQLException;
/**
- * Hint statement executor factory.
+ * Hint RAL statement executor factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class HintStatementExecutorFactory {
+public final class HintRALStatementExecutorFactory {
/**
- * Create hint statement executor instance.
+ * Create hint RAL statement executor instance.
*
- * @param sqlStatement hint statement
+ * @param sqlStatement hint RAL statement
* @param connectionSession connection session
- * @return hint command executor
+ * @return hint RAL statement executor
* @throws SQLException SQL exception
*/
- public static HintStatementExecutor<? extends HintDistSQLStatement>
newInstance(final HintDistSQLStatement sqlStatement, final ConnectionSession
connectionSession) throws SQLException {
+ public static HintRALStatementExecutor<? extends HintRALStatement>
newInstance(final HintRALStatement sqlStatement, final ConnectionSession
connectionSession) throws SQLException {
if (sqlStatement instanceof SetReadwriteSplittingHintStatement) {
return new
SetReadwriteSplittingHintExecutor((SetReadwriteSplittingHintStatement)
sqlStatement);
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintShardingType.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintShardingType.java
similarity index 98%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintShardingType.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintShardingType.java
index 94eceabeb55..fbcbefe572f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintShardingType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintShardingType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.enums;
/**
* Hint sharding type.
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintSourceType.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintSourceType.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintSourceType.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintSourceType.java
index 6cacbe08f0f..9ceae7055ec 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintSourceType.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/enums/HintSourceType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintQueryExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintQueryExecutor.java
similarity index 90%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintQueryExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintQueryExecutor.java
index b48e36ae413..788a780207d 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintQueryExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintQueryExecutor.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseCell;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintStatementExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALStatementExecutor;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -33,7 +33,7 @@ import java.util.List;
/**
* Abstract hint query executor.
*/
-public abstract class AbstractHintQueryExecutor<T extends
HintDistSQLStatement> implements HintStatementExecutor<T> {
+public abstract class AbstractHintQueryExecutor<T extends HintRALStatement>
implements HintRALStatementExecutor<T> {
private List<QueryHeader> queryHeaders;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintUpdateExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintUpdateExecutor.java
similarity index 82%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintUpdateExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintUpdateExecutor.java
index d1fc84ab124..c9cfba2c9c2 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AbstractHintUpdateExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AbstractHintUpdateExecutor.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintStatementExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALStatementExecutor;
/**
* Abstract hint update executor.
*/
-public abstract class AbstractHintUpdateExecutor<T extends
HintDistSQLStatement> implements HintStatementExecutor<T> {
+public abstract class AbstractHintUpdateExecutor<T extends HintRALStatement>
implements HintRALStatementExecutor<T> {
@Override
public final boolean next() {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintDatabaseValueExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintDatabaseValueExecutor.java
similarity index 97%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintDatabaseValueExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintDatabaseValueExecutor.java
index f3e8d33db5e..2449f2cd060 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintDatabaseValueExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintDatabaseValueExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintDatabaseValueStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintTableValueExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintTableValueExecutor.java
similarity index 97%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintTableValueExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintTableValueExecutor.java
index 5a3ffe7dea5..377c2eb6218 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/AddShardingHintTableValueExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/AddShardingHintTableValueExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintTableValueStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearHintExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearHintExecutor.java
similarity index 91%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearHintExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearHintExecutor.java
index ee75cbc47ed..537bbe7474f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearHintExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearHintExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.hint.ClearHintStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.hint.ClearHintStatement;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
/**
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearReadwriteSplittingHintExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearReadwriteSplittingHintExecutor.java
similarity index 96%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearReadwriteSplittingHintExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearReadwriteSplittingHintExecutor.java
index 8fe599a2c1a..11c5dbd8c6f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearReadwriteSplittingHintExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearReadwriteSplittingHintExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ClearReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearShardingHintExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearShardingHintExecutor.java
similarity index 96%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearShardingHintExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearShardingHintExecutor.java
index e954a302b8a..e39aa014729 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ClearShardingHintExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ClearShardingHintExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.ClearShardingHintStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetReadwriteSplittingHintExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetReadwriteSplittingHintExecutor.java
similarity index 96%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetReadwriteSplittingHintExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetReadwriteSplittingHintExecutor.java
index 5dcc417be9b..eda42d31c91 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetReadwriteSplittingHintExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetReadwriteSplittingHintExecutor.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintSourceType;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.enums.HintSourceType;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.SetReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetShardingHintDatabaseValueExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetShardingHintDatabaseValueExecutor.java
similarity index 97%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetShardingHintDatabaseValueExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetShardingHintDatabaseValueExecutor.java
index 9f7d5f1f276..84a51e2208e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/SetShardingHintDatabaseValueExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/SetShardingHintDatabaseValueExecutor.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintManagerHolder;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintManagerHolder;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.SetShardingHintDatabaseValueStatement;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.EmptyStatement;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
similarity index 97%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
index cdaafebe3a5..2079d963ad9 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowReadwriteSplittingHintStatusExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.hint.HintManager;
@@ -23,7 +23,7 @@ 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;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintSourceType;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.enums.HintSourceType;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
import java.sql.Types;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowShardingHintStatusExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowShardingHintStatusExecutor.java
similarity index 98%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowShardingHintStatusExecutor.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowShardingHintStatusExecutor.java
index 9863d7ab996..a1b6cd8ec2b 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/executor/ShowShardingHintStatusExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/executor/ShowShardingHintStatusExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
@@ -28,8 +28,8 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.RuleNotExistedException;
import
org.apache.shardingsphere.proxy.backend.response.header.query.QueryHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.HintShardingType;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.result.ShowShardingHintStatusResult;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.enums.HintShardingType;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.result.ShowShardingHintStatusResult;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.hint.ShowShardingHintStatusStatement;
import java.sql.Types;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/result/ShowShardingHintStatusResult.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/result/ShowShardingHintStatusResult.java
similarity index 98%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/result/ShowShardingHintStatusResult.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/result/ShowShardingHintStatusResult.java
index 2d0ab821b16..ff855709ebb 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/result/ShowShardingHintStatusResult.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/hint/result/ShowShardingHintStatusResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.result;
+package org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.result;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
index c8cae084581..f01c51aacfc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.proxy.backend.text.admin.DatabaseAdminUpdateBac
import
org.apache.shardingsphere.proxy.backend.text.data.impl.SchemaAssignedDatabaseBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.data.impl.UnicastDatabaseBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.QueryableRALBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.HintDistSQLBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALBackendHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.updatable.SetVariableHandler;
import
org.apache.shardingsphere.proxy.backend.text.distsql.rql.RQLBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
@@ -123,7 +123,7 @@ public final class TextProtocolBackendHandlerFactoryTest
extends ProxyContextRes
assertThat(actual, instanceOf(QueryableRALBackendHandler.class));
sql = "set sharding hint database_value=1";
actual = TextProtocolBackendHandlerFactory.newInstance(databaseType,
sql, Optional::empty, connectionSession);
- assertThat(actual, instanceOf(HintDistSQLBackendHandler.class));
+ assertThat(actual, instanceOf(HintRALBackendHandler.class));
}
@Test
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactoryTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintRALStatementExecutorFactoryTest.java
similarity index 56%
rename from
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactoryTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintRALStatementExecutorFactoryTest.java
index 5494920804e..97e1850b4c8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintStatementExecutorFactoryTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/hint/HintRALStatementExecutorFactoryTest.java
@@ -17,18 +17,19 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.HintDistSQLStatement;
-import
org.apache.shardingsphere.distsql.parser.statement.ral.common.hint.ClearHintStatement;
+import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.hint.ClearHintStatement;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.AddShardingHintDatabaseValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.AddShardingHintTableValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearReadwriteSplittingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ClearShardingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.SetReadwriteSplittingHintExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.SetShardingHintDatabaseValueExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ShowReadwriteSplittingHintStatusExecutor;
-import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.hint.executor.ShowShardingHintStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.HintRALStatementExecutorFactory;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.AddShardingHintDatabaseValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.AddShardingHintTableValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearReadwriteSplittingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ClearShardingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.SetReadwriteSplittingHintExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.SetShardingHintDatabaseValueExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ShowReadwriteSplittingHintStatusExecutor;
+import
org.apache.shardingsphere.proxy.backend.text.distsql.ral.hint.executor.ShowShardingHintStatusExecutor;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ClearReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.SetReadwriteSplittingHintStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.hint.ShowReadwriteSplittingHintStatusStatement;
@@ -49,62 +50,62 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
-public final class HintStatementExecutorFactoryTest {
+public final class HintRALStatementExecutorFactoryTest {
@Mock
private ConnectionSession connectionSession;
@Test
public void assertSetReadwriteSplittingHintSourceExecutor() throws
SQLException {
- HintDistSQLStatement sqlStatement =
mock(SetReadwriteSplittingHintStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(SetReadwriteSplittingHintExecutor.class));
+ HintRALStatement sqlStatement =
mock(SetReadwriteSplittingHintStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(SetReadwriteSplittingHintExecutor.class));
}
@Test
public void assertShowReadwriteSplittingHintSourceExecutor() throws
SQLException {
- HintDistSQLStatement sqlStatement =
mock(ShowReadwriteSplittingHintStatusStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ShowReadwriteSplittingHintStatusExecutor.class));
+ HintRALStatement sqlStatement =
mock(ShowReadwriteSplittingHintStatusStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ShowReadwriteSplittingHintStatusExecutor.class));
}
@Test
public void assertClearReadwriteSplittingHintSourceExecutor() throws
SQLException {
- HintDistSQLStatement sqlStatement =
mock(ClearReadwriteSplittingHintStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearReadwriteSplittingHintExecutor.class));
+ HintRALStatement sqlStatement =
mock(ClearReadwriteSplittingHintStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearReadwriteSplittingHintExecutor.class));
}
@Test
public void assertClearHintExecutor() throws SQLException {
- HintDistSQLStatement sqlStatement = mock(ClearHintStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearHintExecutor.class));
+ HintRALStatement sqlStatement = mock(ClearHintStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearHintExecutor.class));
}
@Test
public void assertSetShardingHintDatabaseValueExecutor() throws
SQLException {
- HintDistSQLStatement sqlStatement =
mock(SetShardingHintDatabaseValueStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(SetShardingHintDatabaseValueExecutor.class));
+ HintRALStatement sqlStatement =
mock(SetShardingHintDatabaseValueStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(SetShardingHintDatabaseValueExecutor.class));
}
@Test
public void assertAddShardingHintDatabaseValueExecutor() throws
SQLException {
- HintDistSQLStatement sqlStatement =
mock(AddShardingHintDatabaseValueStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(AddShardingHintDatabaseValueExecutor.class));
+ HintRALStatement sqlStatement =
mock(AddShardingHintDatabaseValueStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(AddShardingHintDatabaseValueExecutor.class));
}
@Test
public void assertAddShardingHintTableValueExecutor() throws SQLException {
- HintDistSQLStatement sqlStatement =
mock(AddShardingHintTableValueStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(AddShardingHintTableValueExecutor.class));
+ HintRALStatement sqlStatement =
mock(AddShardingHintTableValueStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(AddShardingHintTableValueExecutor.class));
}
@Test
public void assertShowShardingHintStatusExecutor() throws SQLException {
- HintDistSQLStatement sqlStatement =
mock(ShowShardingHintStatusStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ShowShardingHintStatusExecutor.class));
+ HintRALStatement sqlStatement =
mock(ShowShardingHintStatusStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ShowShardingHintStatusExecutor.class));
}
@Test
public void assertClearShardingValueHintExecutor() throws SQLException {
- HintDistSQLStatement sqlStatement =
mock(ClearShardingHintStatement.class);
- assertThat(HintStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearShardingHintExecutor.class));
+ HintRALStatement sqlStatement = mock(ClearShardingHintStatement.class);
+ assertThat(HintRALStatementExecutorFactory.newInstance(sqlStatement,
connectionSession), instanceOf(ClearShardingHintExecutor.class));
}
}
