feature：init Namingserver server (#6538)

Author: ggbocoder

build/pom.xml

@@ -88,6 +88,7 @@
         <kafka-appender.version>0.2.0-RC2</kafka-appender.version>
         <kafka-clients.version>3.6.1</kafka-clients.version>
         <snakeyaml.version>2.0</snakeyaml.version>
+        <jackson-mapper.version>1.9.13</jackson-mapper.version>
 
         <!-- For test -->
         <junit-jupiter.version>5.8.2</junit-jupiter.version>

changes/en-us/2.x.md

@@ -5,7 +5,7 @@ Add changes here for all PR submitted to the 2.x branch.
 ### feature:
 - [[#6226](https://github.com/apache/incubator-seata/pull/6226)] multi-version seata protocol support
 - [[#6537](https://github.com/apache/incubator-seata/pull/6537)] support Namingserver
-
+- [[#6538](https://github.com/apache/incubator-seata/pull/6538)] Integration of naming server on the Seata server side
 ### bugfix:
 - [[#6592](https://github.com/apache/incubator-seata/pull/6592)] fix @Async annotation not working in ClusterWatcherManager
 - [[#6624](https://github.com/apache/incubator-seata/pull/6624)] fix Alibaba Dubbo convert error

changes/zh-cn/2.x.md

@@ -5,6 +5,7 @@
 ### feature:
 - [[#6226](https://github.com/apache/incubator-seata/pull/6226)] 支持seata私有协议多版本兼容
 - [[#6537](https://github.com/apache/incubator-seata/pull/6537)] 支持 Namingserver
+- [[#6538](https://github.com/apache/incubator-seata/pull/6538)] seata server端集成naming server
 
 ### bugfix:
 - [[#6592](https://github.com/apache/incubator-seata/pull/6592)] fix @Async注解ClusterWatcherManager中不生效的问题
@@ -49,6 +50,7 @@
 
 
 
+
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
 
 <!-- 请确保您的 GitHub ID 在以下列表中 -->

common/src/main/java/org/apache/seata/common/ConfigurationKeys.java

@@ -811,6 +811,11 @@ public interface ConfigurationKeys {
      */
     String SERVER_ENABLE_CHECK_AUTH = SERVER_PREFIX + "enableCheckAuth";
 
+    /**
+     * The constant NAMING_SERVER
+     */
+    String NAMING_SERVER = "namingserver";
+
     /**
      * The constant APPLICATION_ID.
      */
@@ -1011,4 +1016,39 @@ public interface ConfigurationKeys {
      * The constant ROCKET_MQ_MSG_TIMEOUT
      */
     String ROCKET_MQ_MSG_TIMEOUT = SERVER_PREFIX + "rocketmqMsgTimeout";
+
+    /**
+     *
+     */
+    String NAMINGSERVER_REGISTRY_PREFIX = FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + NAMING_SERVER + FILE_CONFIG_SPLIT_CHAR;
+
+    /**
+     *
+     */
+    String SEATA_NAMINGSERVER_REGISTRY_PREFIX = SEATA_FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + NAMINGSERVER_REGISTRY_PREFIX;
+
+    /**
+     * The constant REGISTRY_NAMINGSERVER_CLUSTER
+     */
+    String REGISTRY_NAMINGSERVER_CLUSTER = NAMINGSERVER_REGISTRY_PREFIX + "cluster";
+
+    /**
+     * The constant MAPPING_TABLE_NAME
+     */
+    String MAPPING_TABLE_NAME = STORE_DB_PREFIX + FILE_CONFIG_SPLIT_CHAR + "mapping-table";
+
+    /**
+     * The constant NAMESPACE_KEY
+     */
+    String NAMESPACE_KEY = SEATA_NAMINGSERVER_REGISTRY_PREFIX + "namespace";
+
+    /**
+     * The constant CLUSTER_NAME_KEY
+     */
+    String CLUSTER_NAME_KEY = SEATA_FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + REGISTRY_NAMINGSERVER_CLUSTER;
+
+    /**
+     * The constant META_PREFIX
+     */
+    String META_PREFIX = SEATA_FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + "metadata.";
 }

namingserver/src/main/java/org/apache/seata/namingserver/constants/NamingServerConstants.java renamed to common/src/main/java/org/apache/seata/common/NamingServerConstants.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.seata.namingserver.constants;
+package org.apache.seata.common;
 
 public interface NamingServerConstants {
     /**
@@ -46,4 +46,10 @@ public interface NamingServerConstants {
      * The constant IP_PORT_SPLIT_CHAR
      */
     String IP_PORT_SPLIT_CHAR = ":";
+
+    /**
+     * The constant DEFAULT_VGROUP_MAPPING
+     */
+    String DEFAULT_VGROUP_MAPPING = "vgroup_table";
+
 }

common/src/main/java/org/apache/seata/common/exception/ErrorCode.java

@@ -29,11 +29,18 @@ public enum ErrorCode {
     /**
      * 0100 ~ 0199 Security related errors
      */
-    ERR_DESERIALIZATION_SECURITY(ErrorType.Security, 0156);
+    ERR_DESERIALIZATION_SECURITY(ErrorType.Security, 0156),
 
     /**
      * The error code of the transaction exception.
      */
+
+
+    /**
+     * The error code of the sql exception
+     */
+    ERROR_SQL(ErrorType.Datasource, 0201);
+
     private int code;
     private ErrorType type;
 
@@ -82,10 +89,6 @@ enum ErrorType {
          * Network error type.
          */
         Network,
-        /**
-         * Security related error type.
-         */
-        Security,
         /**
          * Tm error type.
          */
@@ -102,6 +105,10 @@ enum ErrorType {
          * Datasource error type.
          */
         Datasource,
+        /**
+         * Security error type.
+         */
+        Security,
         /**
          * Other error type.
          */

common/src/main/java/org/apache/seata/common/metadata/Cluster.java

@@ -26,6 +26,7 @@ public class Cluster {
     private String clusterType;
     private List<Unit> unitData = new ArrayList<>();
 
+
     public Cluster() {
     }
 

core/src/main/java/org/apache/seata/core/store/MappingDO.java

@@ -0,0 +1,61 @@
+/*
+ * 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.seata.core.store;
+
+public class MappingDO {
+    private String namespace;
+
+    private String cluster;
+
+    private String unit;
+
+    private String vGroup;
+
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+
+    public String getCluster() {
+        return cluster;
+    }
+
+    public void setCluster(String cluster) {
+        this.cluster = cluster;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getVGroup() {
+        return vGroup;
+    }
+
+    public void setVGroup(String vGroup) {
+        this.vGroup = vGroup;
+    }
+
+}

namingserver/src/main/java/org/apache/seata/namingserver/manager/NamingManager.java

@@ -26,7 +26,7 @@
 import org.apache.seata.common.metadata.namingserver.Unit;
 import org.apache.seata.common.result.Result;
 import org.apache.seata.common.util.HttpClientUtil;
-import org.apache.seata.namingserver.constants.NamingServerConstants;
+import org.apache.seata.common.NamingServerConstants;
 import org.apache.seata.namingserver.listener.ClusterChangeEvent;
 import org.apache.seata.namingserver.entity.pojo.ClusterData;
 import org.apache.seata.namingserver.entity.vo.monitor.ClusterVO;
@@ -55,7 +55,7 @@
 import javax.annotation.PostConstruct;
 
 
-import static org.apache.seata.namingserver.constants.NamingServerConstants.CONSTANT_GROUP;
+import static org.apache.seata.common.NamingServerConstants.CONSTANT_GROUP;
 
 @Component
 public class NamingManager {

namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java

@@ -35,7 +35,7 @@
 import java.util.UUID;
 
 
-import static org.apache.seata.namingserver.constants.NamingServerConstants.CONSTANT_GROUP;
+import static org.apache.seata.common.NamingServerConstants.CONSTANT_GROUP;
 import static org.junit.jupiter.api.Assertions.*;
 
 

script/server/db/dm.sql

@@ -91,3 +91,12 @@ INSERT INTO "SEATA"."DISTRIBUTED_LOCK" ("LOCK_KEY", "LOCK_VALUE", "EXPIRE") VALU
 INSERT INTO "SEATA"."DISTRIBUTED_LOCK" ("LOCK_KEY", "LOCK_VALUE", "EXPIRE") VALUES ('RetryCommitting', ' ', 0);
 INSERT INTO "SEATA"."DISTRIBUTED_LOCK" ("LOCK_KEY", "LOCK_VALUE", "EXPIRE") VALUES ('RetryRollbacking', ' ', 0);
 INSERT INTO "SEATA"."DISTRIBUTED_LOCK" ("LOCK_KEY", "LOCK_VALUE", "EXPIRE") VALUES ('TxTimeoutCheck', ' ', 0);
+
+
+CREATE TABLE "SEATA"."VGROUP_TABLE"
+(
+    `VGROUP`    VARCHAR2(255),
+    `NAMESPACE` VARCHAR2(255),
+    `CLUSTER`   VARCHAR2(255),
+    PRIMARY KEY (`VGROUP`)
+);

script/server/db/mysql.sql

@@ -87,4 +87,14 @@ CREATE TABLE IF NOT EXISTS `distributed_lock`
 INSERT INTO `distributed_lock` (lock_key, lock_value, expire) VALUES ('AsyncCommitting', ' ', 0);
 INSERT INTO `distributed_lock` (lock_key, lock_value, expire) VALUES ('RetryCommitting', ' ', 0);
 INSERT INTO `distributed_lock` (lock_key, lock_value, expire) VALUES ('RetryRollbacking', ' ', 0);
-INSERT INTO `distributed_lock` (lock_key, lock_value, expire) VALUES ('TxTimeoutCheck', ' ', 0);
+INSERT INTO `distributed_lock` (lock_key, lock_value, expire) VALUES ('TxTimeoutCheck', ' ', 0);
+
+
+CREATE TABLE IF NOT EXISTS `vgroup_table`
+(
+    `vGroup`    VARCHAR(255),
+    `namespace` VARCHAR(255),
+    `cluster`   VARCHAR(255),
+    primary key (`vGroup`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4;

script/server/db/oracle.sql

@@ -87,3 +87,10 @@ INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('AsyncCommit
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('RetryCommitting', ' ', 0);
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('RetryRollbacking', ' ', 0);
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('TxTimeoutCheck', ' ', 0);
+
+CREATE TABLE vgroup_table
+(
+    vGroup    VARCHAR2(255) PRIMARY KEY,
+    namespace VARCHAR2(255),
+    cluster   VARCHAR2(255)
+);

script/server/db/postgresql.sql

@@ -87,3 +87,11 @@ INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('AsyncCommit
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('RetryCommitting', ' ', 0);
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('RetryRollbacking', ' ', 0);
 INSERT INTO distributed_lock (lock_key, lock_value, expire) VALUES ('TxTimeoutCheck', ' ', 0);
+
+CREATE TABLE IF NOT EXISTS vgroup_table
+(
+    vGroup    VARCHAR(255),
+    namespace VARCHAR(255),
+    cluster   VARCHAR(255),
+    PRIMARY KEY (vGroup)
+);

script/server/db/sqlserver.sql

@@ -117,3 +117,12 @@ INSERT INTO [distributed_lock] (lock_key, lock_value, expire) VALUES ('RetryComm
 INSERT INTO [distributed_lock] (lock_key, lock_value, expire) VALUES ('RetryRollbacking', ' ', 0);
 INSERT INTO [distributed_lock] (lock_key, lock_value, expire) VALUES ('TxTimeoutCheck', ' ', 0);
 INSERT INTO [distributed_lock] (lock_key, lock_value, expire) VALUES ('UndologDelete', ' ', 0);
+
+CREATE TABLE [vgroup_table]
+(
+    [vGroup]    nvarchar(255) NOT NULL,
+    [namespace] nvarchar(255) NOT NULL,
+    [cluster]   nvarchar(255) NOT NULL,
+    PRIMARY KEY CLUSTERED ([vGroup])
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+)

server/pom.xml

@@ -282,6 +282,12 @@
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${jackson-mapper.version}</version>
+        </dependency>
     </dependencies>
 
     <build>