Remove nacos in ShardingSphere mode and move to ShardingSphere plugin…

… repository (#28584)
apache · Sep 26, 2023 · 267ddcd · 267ddcd
1 parent 3b220d7
commit 267ddcd
Show file tree

Hide file tree

Showing 25 changed files with 4 additions and 1,444 deletions.
diff --git a/docs/document/content/dev-manual/mode.cn.md b/docs/document/content/dev-manual/mode.cn.md
@@ -37,5 +37,4 @@ chapter = true
 |-----------|-------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | ZooKeeper | 基于 ZooKeeper 的持久化 | [`org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java) |
 | etcd      | 基于 Etcd 的持久化      | [`org.apache.shardingsphere.mode.repository.cluster.etcd.EtcdRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java)                          |
-| Nacos     | 基于 Nacos 的持久化     | [`org.apache.shardingsphere.mode.repository.cluster.nacos.NacosRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java)                     |
 | Consul    | 基于 Consul 的持久化    | [`org.apache.shardingsphere.mode.repository.cluster.consul.ConsulRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java)                |
diff --git a/docs/document/content/dev-manual/mode.en.md b/docs/document/content/dev-manual/mode.en.md
@@ -37,5 +37,4 @@ Cluster mode configuration information persistence definition
 |----------------------|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | ZooKeeper            | ZooKeeper based persistence | [`org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java) |
 | etcd                 | Etcd based persistence      | [`org.apache.shardingsphere.mode.repository.cluster.etcd.EtcdRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java)                          |
-| Nacos                | Nacos based persistence     | [`org.apache.shardingsphere.mode.repository.cluster.nacos.NacosRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java)                     |
 | Consul               | Consul based persistence    | [`org.apache.shardingsphere.mode.repository.cluster.consul.ConsulRepository`](https://github.com/apache/shardingsphere/blob/master/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java)                |
diff --git a/...t/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md b/...t/content/user-manual/common-config/builtin-algorithm/metadata-repository.cn.md
@@ -54,21 +54,6 @@ Apache ShardingSphere 为不同的运行模式提供了不同的元数据持久
 | timeToLiveSeconds | long   | 临时数据失效的秒数 | 30    |
 | connectionTimeout | long   | 连接超时秒数    | 30    |
 
-### Nacos 持久化
-
-类型：Nacos
-
-适用模式：Cluster
-
-可配置属性：
-
-| *名称*                      | *数据类型* | *说明*              | *默认值*  |
-|---------------------------|--------|-------------------|--------|
-| clusterIp                 | String | 集群中的唯一标识          | 真实主机IP |
-| retryIntervalMilliseconds | long   | 重试间隔毫秒数           | 500    |
-| maxRetries                | int    | 客户端检查数据可用性的最大重试次数 | 3      |
-| timeToLiveSeconds         | int    | 临时实例失效的秒数         | 30     |
-
 ### Consul 持久化
 
 类型：Consul

diff --git a/...t/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md b/...t/content/user-manual/common-config/builtin-algorithm/metadata-repository.en.md
@@ -54,21 +54,6 @@ Attributes:
 | timeToLiveSeconds | long   | Seconds of ephemeral data live | 30              |
 | connectionTimeout | long   | Seconds of connection timeout  | 30              |
 
-### Nacos Repository
-
-Type: Nacos
-
-Mode: Cluster
-
-Attributes:
-
-| *Name*                    | *Type* | *Description*                                     | *Default Value* |
-|---------------------------|--------|---------------------------------------------------|-----------------|
-| clusterIp                 | String | Unique identifier in cluster                      | Host IP         |
-| retryIntervalMilliseconds | long   | Milliseconds of retry interval                    | 500             |
-| maxRetries                | int    | Max retries for client to check data availability | 3               |
-| timeToLiveSeconds         | int    | Seconds of ephemeral instance live                | 30              |
-
 ### Consul Repository
 
 Type: Consul

diff --git a/.../document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md b/.../document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md
@@ -46,7 +46,6 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
 - 集群模式配置信息持久化定义
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`，基于 Zookeeper 的持久化实现
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-etcd`，基于 Etcd 的持久化实现
-  - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-nacos`，基于 Nacos 的持久化实现
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`，基于 Consul 的持久化实现
 - XA 分布式事务管理器
   - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`，基于 Narayana 的 XA 分布式事务管理器

diff --git a/.../document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md b/.../document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md
@@ -46,7 +46,6 @@ All optional plugins are listed below in the form of `groupId:artifactId`.
 - Cluster mode configuration information persistence definition
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-zookeeper`, Zookeeper based persistence
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-etcd`, Etcd based persistence
-  - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-nacos`, Nacos based persistence
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`, Consul based persistence
 - XA transaction manager provider definition
   - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana

diff --git a/...document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md b/...document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md
@@ -33,7 +33,6 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存
 - 单机模式配置信息持久化定义
   - `org.apache.shardingsphere:shardingsphere-standalone-mode-repository-jdbc`，基于 JDBC 的持久化
 - 集群模式配置信息持久化定义
-  - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-nacos`，基于 Nacos 的持久化实现
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`，基于 Consul 的持久化实现
 - XA 分布式事务管理器
   - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`，基于 Narayana 的 XA 分布式事务管理器

diff --git a/...document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md b/...document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md
@@ -33,7 +33,6 @@ All optional plugins are listed below in the form of `groupId:artifactId`.
 - Standalone mode configuration information persistence definition
   - `org.apache.shardingsphere:shardingsphere-standalone-mode-repository-jdbc`, JDBC based persistence
 - Cluster mode configuration information persistence definition
-  - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-nacos`, Nacos based persistence
   - `org.apache.shardingsphere:shardingsphere-cluster-mode-repository-consul`, Consul based persistence
 - XA transaction manager provider definition
   - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -117,11 +117,6 @@
                 <artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.shardingsphere</groupId>
-                <artifactId>shardingsphere-cluster-mode-repository-nacos</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.shardingsphere</groupId>
                 <artifactId>shardingsphere-infra-common</artifactId>

diff --git a/.../shardingsphere-jdbc-example-generator/src/main/resources/template/resources/registry.ftl b/.../shardingsphere-jdbc-example-generator/src/main/resources/template/resources/registry.ftl
@@ -16,14 +16,9 @@
 #
 
 registry {
-  # file 、nacos 、eureka、redis、zk
+  # file 、eureka、redis、zk
   type = "file"
 
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
   eureka {
     serviceUrl = "http://localhost:1001/eureka"
     application = "default"
@@ -45,14 +40,9 @@ registry {
 }
 
 config {
-  # file、nacos 、apollo、zk
+  # file、apollo、zk
   type = "file"
 
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
   apollo {
     app.id = "fescar-server"
     apollo.meta = "http://192.168.1.204:8801"

diff --git a/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf b/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf
@@ -16,14 +16,9 @@
 #
 
 registry {
-  # file 、nacos 、eureka、redis、zk
+  # file 、eureka、redis、zk
   type = "file"
 
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
   eureka {
     serviceUrl = "http://localhost:1001/eureka"
     application = "default"
@@ -45,14 +40,9 @@ registry {
 }
 
 config {
-  # file、nacos 、apollo、zk
+  # file、apollo、zk
   type = "file"
 
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
   apollo {
     app.id = "fescar-server"
     apollo.meta = "http://192.168.1.204:8801"

diff --git a/mode/type/cluster/repository/provider/nacos/pom.xml b/mode/type/cluster/repository/provider/nacos/pom.xml