Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature:init Namingserver server #6538

Merged
merged 33 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
50c77dc
add signature
ggbocoder Jan 2, 2024
b36f5b2
Merge remote-tracking branch 'upstream/2.x' into 2.x
ggbocoder Jan 20, 2024
e15537d
Merge remote-tracking branch 'upstream/2.x' into 2.x
ggbocoder Jan 25, 2024
85398ec
Merge remote-tracking branch 'upstream/2.x' into 2.x
ggbocoder Jan 31, 2024
e049125
Merge remote-tracking branch 'upstream/2.x' into 2.x
ggbocoder Mar 7, 2024
2939f59
Merge remote-tracking branch 'upstream/2.x' into 2.x
ggbocoder May 12, 2024
c2bf8c3
init namingserver-server
ggbocoder May 12, 2024
4d50d79
fix ci
ggbocoder May 13, 2024
b9b899b
fix ci
ggbocoder May 13, 2024
2abe43e
fix ci
ggbocoder May 13, 2024
0e72bf7
register
ggbocoder Jul 4, 2024
b9e58e8
Merge remote-tracking branch 'upstream/2.x' into namingserver-server
ggbocoder Jul 9, 2024
801744b
merge
ggbocoder Jul 9, 2024
a95c480
Merge remote-tracking branch 'upstream/2.x' into namingserver-server
ggbocoder Jul 15, 2024
c494e91
add tests
ggbocoder Jul 15, 2024
527e820
add licenses
ggbocoder Jul 16, 2024
f9c7604
add licenses
ggbocoder Jul 16, 2024
e28ab6e
Merge branch '2.x' into namingserver-server
funky-eyes Jul 17, 2024
f4654b4
optimize
ggbocoder Jul 17, 2024
5a51c56
Merge remote-tracking branch 'origin/namingserver-server' into naming…
ggbocoder Jul 17, 2024
fac38e0
optimize
ggbocoder Jul 18, 2024
6d5cbfd
register when startup
ggbocoder Jul 18, 2024
4e9bb36
code format
ggbocoder Jul 18, 2024
a1eab1c
fix some problems
ggbocoder Jul 23, 2024
348d9b5
opt
ggbocoder Jul 24, 2024
f4e527b
pass ci
ggbocoder Jul 24, 2024
1065d86
fix some problems
ggbocoder Jul 26, 2024
0f2508f
fix some problems
ggbocoder Jul 28, 2024
523b9aa
Merge remote-tracking branch 'upstream/2.x' into namingserver-server
ggbocoder Jul 28, 2024
3996536
fix
ggbocoder Jul 28, 2024
f23a3e4
fix UT
ggbocoder Jul 30, 2024
ff44185
fix UT
ggbocoder Jul 30, 2024
e784690
Merge branch '2.x' into namingserver-server
funky-eyes Jul 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
optimize
  • Loading branch information
ggbocoder committed Jul 17, 2024
commit f4654b49699239e2537e64ea23a8e1406c9d5021
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down Expand Up @@ -46,4 +46,19 @@ 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";

/**
* The constant REGISTRY_NAMINGSERVER_CLUSTER
*/
String REGISTRY_NAMINGSERVER_CLUSTER = "registry.namingserver.cluster";
funky-eyes marked this conversation as resolved.
Show resolved Hide resolved

/**
* The constant MAPPING_TABLE_NAME
*/
String MAPPING_TABLE_NAME = "store.db.mapping-table";
funky-eyes marked this conversation as resolved.
Show resolved Hide resolved
}
193 changes: 0 additions & 193 deletions common/src/main/java/org/apache/seata/common/metadata/Instance.java

This file was deleted.

This file was deleted.

68 changes: 0 additions & 68 deletions common/src/main/java/org/apache/seata/common/metadata/Unit.java
funky-eyes marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;


Expand Down
9 changes: 9 additions & 0 deletions script/server/db/dm.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
);
12 changes: 11 additions & 1 deletion script/server/db/mysql.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Loading