Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

precheck: support primary/unique key check #870

Merged
merged 7 commits into from
Aug 10, 2020
Merged

precheck: support primary/unique key check #870

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2a0fd1
update tool and fix tests
GMHDBJD Aug 7, 2020
e8e4344
fix tests
GMHDBJD Aug 7, 2020
e8c1c1e
fix more tests
GMHDBJD Aug 7, 2020
79f05dd
fix tests
GMHDBJD Aug 7, 2020
f1bbcdd
fix test
GMHDBJD Aug 7, 2020
37e0cdd
change tests data
GMHDBJD Aug 10, 2020
aabdf91
Merge remote-tracking branch 'upstream/master' into PKUKcheck
GMHDBJD Aug 10, 2020
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/pingcap/parser v0.0.0-20200717054943-cd445b0c607b
github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200714122454-1a64f969cb3c
github.com/pingcap/tidb v1.1.0-beta.0.20200728020902-472acf7b85b3
github.com/pingcap/tidb-tools v4.0.3-0.20200717061805-6483ba1f6311+incompatible
github.com/pingcap/tidb-tools v4.0.5-0.20200805025317-02a16e0521cb+incompatible
github.com/prometheus/client_golang v1.5.1
github.com/rakyll/statik v0.1.6
github.com/satori/go.uuid v1.2.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,8 @@ github.com/pingcap/tidb-tools v4.0.0+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnw
github.com/pingcap/tidb-tools v4.0.1+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tidb-tools v4.0.3-0.20200717061805-6483ba1f6311+incompatible h1:ZqnNs4xV2X/Ba8EK5N4+XvMaoL6cd94F5YseaRxZARs=
github.com/pingcap/tidb-tools v4.0.3-0.20200717061805-6483ba1f6311+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tidb-tools v4.0.5-0.20200805025317-02a16e0521cb+incompatible h1:obFDQU7XvnCj8CiaXFP+bWaiQDp15Ueynk8cC0s5Utk=
github.com/pingcap/tidb-tools v4.0.5-0.20200805025317-02a16e0521cb+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330 h1:rRMLMjIMFulCX9sGKZ1hoov/iROMsKyC8Snc02nSukw=
github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI=
github.com/pingcap/tipb v0.0.0-20200417094153-7316d94df1ee h1:XJQ6/LGzOSc/jo33AD8t7jtc4GohxcyODsYnb+kZXJM=
Expand Down
1 change: 1 addition & 0 deletions tests/dm_syncer/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
clean-dump-file: false
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/dmctl_command/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/full_mode/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha_cases/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha_cases/conf/dm-task2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha_cases/conf/standalone-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha_cases/conf/standalone-task2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/ha_master/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ meta-schema: "dm_meta"
heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/incremental_mode/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ heartbeat-update-interval: 1
heartbeat-report-interval: 1
timezone: "Asia/Shanghai"
clean-dump-file: false
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/double-source-optimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "optimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/double-source-pessimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "pessimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/no-sharding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ task-mode: all
is-sharding: false
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/single-source-no-routes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ task-mode: all
is-sharding: false
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/single-source-optimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "optimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl1/conf/single-source-pessimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "pessimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl2/conf/double-source-optimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "optimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl2/conf/double-source-pessimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "pessimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl3/conf/double-source-optimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "optimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl3/conf/double-source-pessimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "pessimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl3/conf/single-source-optimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "optimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down
1 change: 1 addition & 0 deletions tests/shardddl3/conf/single-source-pessimistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ is-sharding: true
shard-mode: "pessimistic"
meta-schema: "dm_meta"
timezone: "Asia/Shanghai"
ignore-checking-items: ["table_schema"]

target-database:
host: "127.0.0.1"
Expand Down