You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/06/03 12:29:38 UTC
[shardingsphere] branch master updated: Move module shardingsphere-distsql-handler into infra (#26032)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 19758b7c63e Move module shardingsphere-distsql-handler into infra (#26032)
19758b7c63e is described below
commit 19758b7c63e394eebd51620484e798ff8f81a1d8
Author: Raigor <ra...@gmail.com>
AuthorDate: Sat Jun 3 20:29:30 2023 +0800
Move module shardingsphere-distsql-handler into infra (#26032)
---
distsql/pom.xml | 34 ----------------------
features/encrypt/distsql/handler/pom.xml | 2 +-
features/mask/distsql/handler/pom.xml | 2 +-
.../readwrite-splitting/distsql/handler/pom.xml | 2 +-
features/shadow/distsql/handler/pom.xml | 2 +-
features/sharding/distsql/handler/pom.xml | 2 +-
{distsql/handler => infra/distsql-handler}/pom.xml | 4 +--
.../handler/exception/DistSQLException.java | 0
.../AlgorithmDefinitionViolationException.java | 0
.../algorithm/AlgorithmInUsedException.java | 0
.../algorithm/DuplicateAlgorithmException.java | 0
.../InvalidAlgorithmConfigurationException.java | 0
.../MissingRequiredAlgorithmException.java | 0
.../DataSourceDefinitionViolationException.java | 0
.../MissingRequiredDataSourcesException.java | 0
.../exception/rule/DuplicateRuleException.java | 0
.../rule/InvalidRuleConfigurationException.java | 0
.../rule/MissingRequiredRuleException.java | 0
.../rule/RuleDefinitionViolationException.java | 0
.../exception/rule/RuleInUsedException.java | 0
.../storageunit/DuplicateStorageUnitException.java | 0
.../storageunit/EmptyStorageUnitException.java | 0
.../storageunit/InvalidStorageUnitsException.java | 0
.../MissingRequiredStorageUnitsException.java | 0
.../StorageUnitDefinitionViolationException.java | 0
.../storageunit/StorageUnitInUsedException.java | 0
.../distsql/handler/query/RQLExecutor.java | 0
.../DatabaseRequiredQueryableRALExecutor.java | 0
...nstanceContextRequiredQueryableRALExecutor.java | 0
.../MetaDataRequiredQueryableRALExecutor.java | 0
.../handler/ral/query/QueryableRALExecutor.java | 0
.../handler/ral/update/GlobalRuleRALUpdater.java | 0
.../distsql/handler/ral/update/RALUpdater.java | 0
.../distsql/handler/rul/RULExecutor.java | 0
.../handler/update/RuleDefinitionAlterUpdater.java | 0
.../update/RuleDefinitionCreateUpdater.java | 0
.../handler/update/RuleDefinitionDropUpdater.java | 0
.../handler/update/RuleDefinitionUpdater.java | 0
.../DataSourcePropertiesValidateHandler.java | 0
infra/pom.xml | 15 +++++-----
kernel/authority/distsql/handler/pom.xml | 2 +-
kernel/data-pipeline/distsql/handler/pom.xml | 2 +-
kernel/global-clock/distsql/handler/pom.xml | 2 +-
kernel/single/distsql/handler/pom.xml | 2 +-
kernel/sql-parser/distsql/handler/pom.xml | 2 +-
kernel/sql-translator/distsql/handler/pom.xml | 2 +-
kernel/traffic/distsql/handler/pom.xml | 2 +-
kernel/transaction/distsql/handler/pom.xml | 2 +-
pom.xml | 1 -
report/pom.xml | 2 +-
50 files changed, 24 insertions(+), 58 deletions(-)
diff --git a/distsql/pom.xml b/distsql/pom.xml
deleted file mode 100644
index 230badba001..00000000000
--- a/distsql/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere</artifactId>
- <version>5.3.3-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-distsql</artifactId>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
-
- <modules>
- <module>handler</module>
- </modules>
-</project>
diff --git a/features/encrypt/distsql/handler/pom.xml b/features/encrypt/distsql/handler/pom.xml
index b13257dbbf5..64bb9cd148c 100644
--- a/features/encrypt/distsql/handler/pom.xml
+++ b/features/encrypt/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/features/mask/distsql/handler/pom.xml b/features/mask/distsql/handler/pom.xml
index 6288e113517..ca0bd9b9722 100644
--- a/features/mask/distsql/handler/pom.xml
+++ b/features/mask/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/features/readwrite-splitting/distsql/handler/pom.xml b/features/readwrite-splitting/distsql/handler/pom.xml
index 2455d12facf..f6724b77630 100644
--- a/features/readwrite-splitting/distsql/handler/pom.xml
+++ b/features/readwrite-splitting/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/features/shadow/distsql/handler/pom.xml b/features/shadow/distsql/handler/pom.xml
index aa8aed84941..16a766b61ec 100644
--- a/features/shadow/distsql/handler/pom.xml
+++ b/features/shadow/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/features/sharding/distsql/handler/pom.xml b/features/sharding/distsql/handler/pom.xml
index c9f09fe5298..2c8fa0aa6fc 100644
--- a/features/sharding/distsql/handler/pom.xml
+++ b/features/sharding/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/distsql/handler/pom.xml b/infra/distsql-handler/pom.xml
similarity index 93%
rename from distsql/handler/pom.xml
rename to infra/distsql-handler/pom.xml
index 820b1bff31c..ff6e78fbc97 100644
--- a/distsql/handler/pom.xml
+++ b/infra/distsql-handler/pom.xml
@@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql</artifactId>
+ <artifactId>shardingsphere-infra</artifactId>
<version>5.3.3-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/DistSQLException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/DistSQLException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/DistSQLException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/DistSQLException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmDefinitionViolationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/AlgorithmInUsedException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/DuplicateAlgorithmException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/InvalidAlgorithmConfigurationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/algorithm/MissingRequiredAlgorithmException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/DataSourceDefinitionViolationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/DataSourceDefinitionViolationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/DataSourceDefinitionViolationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/DataSourceDefinitionViolationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/MissingRequiredDataSourcesException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/MissingRequiredDataSourcesException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/MissingRequiredDataSourcesException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/datasource/MissingRequiredDataSourcesException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/DuplicateRuleException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/DuplicateRuleException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/DuplicateRuleException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/DuplicateRuleException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/InvalidRuleConfigurationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/InvalidRuleConfigurationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/InvalidRuleConfigurationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/InvalidRuleConfigurationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/MissingRequiredRuleException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/MissingRequiredRuleException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/MissingRequiredRuleException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/MissingRequiredRuleException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleDefinitionViolationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleDefinitionViolationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleDefinitionViolationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleDefinitionViolationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleInUsedException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleInUsedException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleInUsedException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/rule/RuleInUsedException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/DuplicateStorageUnitException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/DuplicateStorageUnitException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/DuplicateStorageUnitException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/DuplicateStorageUnitException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/EmptyStorageUnitException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/EmptyStorageUnitException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/EmptyStorageUnitException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/EmptyStorageUnitException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/InvalidStorageUnitsException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/InvalidStorageUnitsException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/InvalidStorageUnitsException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/InvalidStorageUnitsException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/MissingRequiredStorageUnitsException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/MissingRequiredStorageUnitsException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/MissingRequiredStorageUnitsException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/MissingRequiredStorageUnitsException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitDefinitionViolationException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitDefinitionViolationException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitDefinitionViolationException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitDefinitionViolationException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitInUsedException.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitInUsedException.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitInUsedException.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/exception/storageunit/StorageUnitInUsedException.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/query/RQLExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/DatabaseRequiredQueryableRALExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/InstanceContextRequiredQueryableRALExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/MetaDataRequiredQueryableRALExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/query/QueryableRALExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/GlobalRuleRALUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/ral/update/RALUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionAlterUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionCreateUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionCreateUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionCreateUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionCreateUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionDropUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionUpdater.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionUpdater.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionUpdater.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/update/RuleDefinitionUpdater.java
diff --git a/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePropertiesValidateHandler.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePropertiesValidateHandler.java
similarity index 100%
rename from distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePropertiesValidateHandler.java
rename to infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePropertiesValidateHandler.java
diff --git a/infra/pom.xml b/infra/pom.xml
index 11fbb045d1c..c6e8840f260 100644
--- a/infra/pom.xml
+++ b/infra/pom.xml
@@ -29,16 +29,17 @@
<name>${project.artifactId}</name>
<modules>
- <module>common</module>
- <module>parser</module>
<module>binder</module>
- <module>session</module>
- <module>route</module>
- <module>rewrite</module>
- <module>executor</module>
- <module>merge</module>
+ <module>common</module>
<module>context</module>
+ <module>distsql-handler</module>
+ <module>executor</module>
<module>expr</module>
+ <module>merge</module>
+ <module>parser</module>
+ <module>rewrite</module>
+ <module>route</module>
+ <module>session</module>
<module>util</module>
</modules>
</project>
diff --git a/kernel/authority/distsql/handler/pom.xml b/kernel/authority/distsql/handler/pom.xml
index 1b4b5efdd48..3d948cc5d76 100644
--- a/kernel/authority/distsql/handler/pom.xml
+++ b/kernel/authority/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/data-pipeline/distsql/handler/pom.xml b/kernel/data-pipeline/distsql/handler/pom.xml
index dc98c31cc1b..5991863b40b 100644
--- a/kernel/data-pipeline/distsql/handler/pom.xml
+++ b/kernel/data-pipeline/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/global-clock/distsql/handler/pom.xml b/kernel/global-clock/distsql/handler/pom.xml
index f6af2aba39b..268a2c17e23 100644
--- a/kernel/global-clock/distsql/handler/pom.xml
+++ b/kernel/global-clock/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/single/distsql/handler/pom.xml b/kernel/single/distsql/handler/pom.xml
index d76e2a9fe6f..847f091a71a 100644
--- a/kernel/single/distsql/handler/pom.xml
+++ b/kernel/single/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/sql-parser/distsql/handler/pom.xml b/kernel/sql-parser/distsql/handler/pom.xml
index 2828f25a765..13368fb5a3e 100644
--- a/kernel/sql-parser/distsql/handler/pom.xml
+++ b/kernel/sql-parser/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/sql-translator/distsql/handler/pom.xml b/kernel/sql-translator/distsql/handler/pom.xml
index 9d72f5c50f3..13fd03d021a 100644
--- a/kernel/sql-translator/distsql/handler/pom.xml
+++ b/kernel/sql-translator/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/traffic/distsql/handler/pom.xml b/kernel/traffic/distsql/handler/pom.xml
index 32d21c93ade..de686bdbe85 100644
--- a/kernel/traffic/distsql/handler/pom.xml
+++ b/kernel/traffic/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kernel/transaction/distsql/handler/pom.xml b/kernel/transaction/distsql/handler/pom.xml
index b5624ac10a4..554313bc49e 100644
--- a/kernel/transaction/distsql/handler/pom.xml
+++ b/kernel/transaction/distsql/handler/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 82ee2f61242..2ae4f421cd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
<module>infra</module>
<module>dialect-exception</module>
<module>parser</module>
- <module>distsql</module>
<module>db-protocol</module>
<module>mode</module>
<module>kernel</module>
diff --git a/report/pom.xml b/report/pom.xml
index 72b1faf2b24..c98b630c5d9 100644
--- a/report/pom.xml
+++ b/report/pom.xml
@@ -329,7 +329,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-distsql-handler</artifactId>
+ <artifactId>shardingsphere-infra-distsql-handler</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>