This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 b4960d0ab56 Refactor package of distsql.handler.type.ral (#29966)
b4960d0ab56 is described below
commit b4960d0ab56c41bb1c72c99247e7754e0a1b2b04
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 2 17:09:29 2024 +0800
Refactor package of distsql.handler.type.ral (#29966)
---
.../handler/provider/EncryptConvertRuleConfigurationProvider.java | 2 +-
...distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider} | 0
.../handler/provider/MaskConvertRuleConfigurationProvider.java | 2 +-
...distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider} | 0
.../provider/ReadwriteSplittingConvertRuleConfigurationProvider.java | 2 +-
...distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider} | 0
.../handler/provider/ShadowConvertRuleConfigurationProvider.java | 2 +-
...distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider} | 0
.../handler/provider/ShardingConvertRuleConfigurationProvider.java | 2 +-
...distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider} | 0
.../ral/{query => }/algorithm/AlgorithmMetaDataQueryResultRow.java | 2 +-
.../ral/{query => }/algorithm/AlgorithmMetaDataQueryResultRows.java | 2 +-
.../type/ral/{query => convert}/ConvertRuleConfigurationProvider.java | 3 +--
.../type/ral/{constant => convert}/DistSQLScriptConstants.java | 2 +-
.../distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java | 2 +-
.../distsql/ral/queryable/ConvertYamlConfigurationExecutor.java | 4 ++--
16 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
index c886382e946..a2b0ad5720e 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/provider/EncryptConvertRuleConfigurationProvider.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.encrypt.distsql.handler.provider;
import com.google.common.base.Strings;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
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/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
b/features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
similarity index 100%
rename from
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
rename to
features/encrypt/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
index cbc3f0abe24..e1d0d0d089f 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/provider/MaskConvertRuleConfigurationProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.distsql.handler.provider;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration;
diff --git
a/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
b/features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
similarity index 100%
rename from
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
rename to
features/mask/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
index 10ac977d6ae..b59bd7824eb 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/provider/ReadwriteSplittingConvertRuleConfigurationProvider.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.distsql.handler.provider;
import com.google.common.base.Strings;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
b/features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
similarity index 100%
rename from
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
rename to
features/readwrite-splitting/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
index 94430c0c660..e89b06e3ee7 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/provider/ShadowConvertRuleConfigurationProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.shadow.distsql.handler.provider;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
diff --git
a/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
b/features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
similarity index 100%
rename from
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
rename to
features/shadow/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
index 91f257429fe..e2cd0d01d53 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/provider/ShardingConvertRuleConfigurationProvider.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.distsql.handler.provider;
import com.google.common.base.Strings;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
diff --git
a/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
b/features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
similarity index 100%
rename from
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider
rename to
features/sharding/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRow.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRow.java
similarity index 97%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRow.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRow.java
index 5811b0c0b07..e2c422abfd3 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRow.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRow.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.type.ral.query.algorithm;
+package org.apache.shardingsphere.distsql.handler.type.ral.algorithm;
import org.apache.shardingsphere.infra.algorithm.ShardingSphereAlgorithm;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseSupportedTypedSPI;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRows.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRows.java
similarity index 96%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRows.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRows.java
index dc20a60ccd8..0950c94cd58 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/algorithm/AlgorithmMetaDataQueryResultRows.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/algorithm/AlgorithmMetaDataQueryResultRows.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.type.ral.query.algorithm;
+package org.apache.shardingsphere.distsql.handler.type.ral.algorithm;
import org.apache.shardingsphere.infra.algorithm.ShardingSphereAlgorithm;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseSupportedTypedSPI;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/ConvertRuleConfigurationProvider.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/ConvertRuleConfigurationProvider.java
similarity index 95%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/ConvertRuleConfigurationProvider.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/ConvertRuleConfigurationProvider.java
index f7a3734d1ee..3be8752eca0 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/query/ConvertRuleConfigurationProvider.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/ConvertRuleConfigurationProvider.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.type.ral.query;
+package org.apache.shardingsphere.distsql.handler.type.ral.convert;
-import
org.apache.shardingsphere.distsql.handler.type.ral.constant.DistSQLScriptConstants;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/constant/DistSQLScriptConstants.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/DistSQLScriptConstants.java
similarity index 97%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/constant/DistSQLScriptConstants.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/DistSQLScriptConstants.java
index 94cea22feae..6d34eedb9f1 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/constant/DistSQLScriptConstants.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/convert/DistSQLScriptConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.type.ral.constant;
+package org.apache.shardingsphere.distsql.handler.type.ral.convert;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
index 187acac2035..d3ccce8baac 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.migration.distsql.handler.query;
import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.TableDataConsistencyChecker;
import
org.apache.shardingsphere.data.pipeline.migration.distsql.statement.ShowMigrationCheckAlgorithmsStatement;
import org.apache.shardingsphere.distsql.handler.type.DistSQLQueryExecutor;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.algorithm.AlgorithmMetaDataQueryResultRows;
+import
org.apache.shardingsphere.distsql.handler.type.ral.algorithm.AlgorithmMetaDataQueryResultRows;
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.mode.manager.ContextManager;
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 6586c74f550..48c2cddf7ba 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
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import org.apache.shardingsphere.distsql.handler.type.DistSQLQueryExecutor;
-import
org.apache.shardingsphere.distsql.handler.type.ral.constant.DistSQLScriptConstants;
-import
org.apache.shardingsphere.distsql.handler.type.ral.query.ConvertRuleConfigurationProvider;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.DistSQLScriptConstants;
+import
org.apache.shardingsphere.distsql.handler.type.ral.convert.ConvertRuleConfigurationProvider;
import
org.apache.shardingsphere.distsql.statement.ral.queryable.convert.ConvertYamlConfigurationStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
