Skip to content

Commit 5e77eab

Browse files
dk-lockdowndk-lockdown
authored
support ComInitDB (#301)
* fix: support tablename with schema * feat: support ComInitDB
1 parent 75e86e9 commit 5e77eab

25 files changed

Lines changed: 443 additions & 106 deletions

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Unit Tests
5656
run: |
5757
mkdir -p build
58-
go test -gcflags=all=-l ./pkg/... -coverprofile=coverage.txt -covermode=atomic
58+
go test -gcflags=all=-l $(go list ./... | grep -v /test/ | grep -v /parser | grep -v /types | grep -v /bucketpool) -coverprofile=coverage.txt -covermode=atomic
5959
6060
- name: Post Coverage
6161
run: bash <(curl -s https://codecov.io/bash)

‎docker/conf/config_rws.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ app_config:
3939
capacity: 10
4040
max_capacity: 20
4141
idle_timeout: 60s
42-
dsn: root:123456@tcp(dbpack-mysql1:3306)/employees?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8
42+
dsn: root:123456@tcp(dbpack-mysql1:3306)/?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8
4343
ping_interval: 20s
4444
ping_times_for_change_status: 3
4545
filters:
@@ -50,7 +50,7 @@ app_config:
5050
capacity: 10
5151
max_capacity: 20
5252
idle_timeout: 60s
53-
dsn: root:123456@tcp(dbpack-mysql2:3306)/employees?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
53+
dsn: root:123456@tcp(dbpack-mysql2:3306)/?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
5454
ping_interval: 20s
5555
ping_times_for_change_status: 3
5656

‎docker/conf/config_sdb.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ app_config:
3434
capacity: 10
3535
max_capacity: 20
3636
idle_timeout: 60s
37-
dsn: root:123456@tcp(dbpack-mysql:3306)/employees?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
37+
dsn: root:123456@tcp(dbpack-mysql:3306)/?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
3838
ping_interval: 20s
3939
ping_times_for_change_status: 3
4040
filters:

‎docker/conf/config_shd_mod.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ app_config:
5353
type: snowflake
5454
config:
5555
worker_id: 123
56-
# dsn: root:123456@tcp(dbpack-mysql1:3306)/world?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
5756
topology:
5857
"0": 0-4
5958
"1": 5-9
@@ -68,7 +67,7 @@ app_config:
6867
capacity: 10
6968
max_capacity: 20
7069
idle_timeout: 60s
71-
dsn: root:123456@tcp(dbpack-mysql1:3306)/world?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
70+
dsn: root:123456@tcp(dbpack-mysql1:3306)/?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
7271
ping_interval: 20s
7372
ping_times_for_change_status: 3
7473
filters:
@@ -78,7 +77,7 @@ app_config:
7877
capacity: 10
7978
max_capacity: 20
8079
idle_timeout: 60s
81-
dsn: root:123456@tcp(dbpack-mysql2:3306)/world?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
80+
dsn: root:123456@tcp(dbpack-mysql2:3306)/?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
8281
ping_interval: 20s
8382
ping_times_for_change_status: 3
8483
filters:

‎docker/conf/config_shd_range.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ app_config:
6464
type: snowflake
6565
config:
6666
worker_id: 123
67-
# dsn: root:123456@tcp(dbpack-mysql1:3306)/world?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
6867
topology:
6968
"0": 0-4
7069
"1": 5-9
@@ -79,7 +78,7 @@ app_config:
7978
capacity: 10
8079
max_capacity: 20
8180
idle_timeout: 60s
82-
dsn: root:123456@tcp(dbpack-mysql1:3306)/world?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
81+
dsn: root:123456@tcp(dbpack-mysql1:3306)/?timeout=10s&readTimeout=10s&writeTimeout=10s&parseTime=true&loc=Local&charset=utf8mb4,utf8
8382
ping_interval: 20s
8483
ping_times_for_change_status: 3
8584
filters:
@@ -89,7 +88,7 @@ app_config:
8988
capacity: 10
9089
max_capacity: 20
9190
idle_timeout: 60s
92-
dsn: root:123456@tcp(dbpack-mysql2:3306)/world?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
91+
dsn: root:123456@tcp(dbpack-mysql2:3306)/?timeout=60s&readTimeout=60s&writeTimeout=60s&parseTime=true&loc=Local&charset=utf8mb4,utf8
9392
ping_interval: 20s
9493
ping_times_for_change_status: 3
9594
filters:

‎docker/docker-compose-rws.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ services:
6464

6565
networks:
6666
local:
67-
name: dbpack
67+
name: dbpack-network

‎docker/docker-compose-sdb.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ services:
4848
command: ["./wait-for-mysql.sh","--","/dbpack", "start", "-c", "config.yaml"]
4949
networks:
5050
local:
51-
name: dbpack
51+
name: dbpack-network

‎docker/docker-compose-shd-mod.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ services:
6060
command: ["./wait-for-mysql.sh","--","/dbpack", "start", "-c", "mod_config.yaml"]
6161
networks:
6262
local:
63-
name: dbpack
63+
name: dbpack-network

‎docker/docker-compose-shd-range.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ services:
6060
command: ["./wait-for-mysql.sh","--","/dbpack", "start", "-c", "range_config.yaml"]
6161
networks:
6262
local:
63-
name: dbpack
63+
name: dbpack-network

‎docker/scripts/init.sql‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,6 @@ CREATE TABLE salaries (
9393
PRIMARY KEY (`id`)
9494
);
9595

96-
CREATE TABLE `undo_log` (
97-
`id` bigint NOT NULL AUTO_INCREMENT,
98-
`branch_id` bigint NOT NULL,
99-
`xid` varchar(100) NOT NULL,
100-
`context` varchar(128) NOT NULL,
101-
`rollback_info` longblob NOT NULL,
102-
`log_status` int NOT NULL,
103-
`log_created` datetime NOT NULL,
104-
`log_modified` datetime NOT NULL,
105-
`ext` varchar(100) DEFAULT NULL,
106-
PRIMARY KEY (`id`)
107-
);
10896

10997
CREATE OR REPLACE VIEW dept_emp_latest_date AS
11098
SELECT emp_no, MAX(from_date) AS from_date, MAX(to_date) AS to_date
@@ -117,3 +105,20 @@ CREATE OR REPLACE VIEW current_dept_emp AS
117105
FROM dept_emp d
118106
INNER JOIN dept_emp_latest_date l
119107
ON d.emp_no=l.emp_no AND d.from_date=l.from_date AND l.to_date = d.to_date;
108+
109+
DROP DATABASE IF EXISTS meta;
110+
CREATE DATABASE IF NOT EXISTS meta;
111+
USE meta;
112+
113+
CREATE TABLE `undo_log` (
114+
`id` bigint NOT NULL AUTO_INCREMENT,
115+
`branch_id` bigint NOT NULL,
116+
`xid` varchar(100) NOT NULL,
117+
`context` varchar(128) NOT NULL,
118+
`rollback_info` longblob NOT NULL,
119+
`log_status` int NOT NULL,
120+
`log_created` datetime NOT NULL,
121+
`log_modified` datetime NOT NULL,
122+
`ext` varchar(100) DEFAULT NULL,
123+
PRIMARY KEY (`id`)
124+
);

0 commit comments

Comments
 (0)