From 12b5051bb19dfb3ee8787360350d42a95cc49444 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Mon, 25 May 2020 12:10:46 +0800 Subject: [PATCH 1/9] add sql statement about pump and drainer --- .../sql-statement-change-drainer.md | 71 +++++++++++++++++++ sql-statements/sql-statement-change-pump.md | 71 +++++++++++++++++++ .../sql-statement-show-drainer-status.md | 38 ++++++++++ .../sql-statement-show-pump-status.md | 38 ++++++++++ 4 files changed, 218 insertions(+) create mode 100644 sql-statements/sql-statement-change-drainer.md create mode 100644 sql-statements/sql-statement-change-pump.md create mode 100644 sql-statements/sql-statement-show-drainer-status.md create mode 100644 sql-statements/sql-statement-show-pump-status.md diff --git a/sql-statements/sql-statement-change-drainer.md b/sql-statements/sql-statement-change-drainer.md new file mode 100644 index 000000000000..e4d4b590a239 --- /dev/null +++ b/sql-statements/sql-statement-change-drainer.md @@ -0,0 +1,71 @@ +--- +title: CHANGE DRAINER +summary: TiDB 数据库中 CHANGE DRAINER 的使用概况。 +category: reference +--- + +# CHANGE DRAINER + +`CHANGE DRAINER` 语句用于修改集群中 Drainer 的状态信息。 + +> **注意：** +> +> Drainer 在正常运行时会自动上报状态到 PD，仅在 Drainer 处于异常情况时实际状态与 PD 中保存的状态信息不一致时， 使用该语句修改 PD 中存储的 Drainer 状态信息。 + +## 示例 + +{{< copyable "sql" >}} + +```sql +SHOW DRAINER STATUS; +``` + +``` ++----------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++----------|----------------|--------|--------------------|---------------------| +| drainer1 | 127.0.0.3:8249 | Online | 408553768673342532 | 2019-04-30 00:00:03 | ++----------|----------------|--------|--------------------|---------------------| +| drainer2 | 127.0.0.4:8249 | Online | 408553768673345531 | 2019-05-01 00:00:04 | ++----------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +可以看出 `drainer1` 已经超过一天没有更新状态，该 Drainer 处于异常状态，但是 State 仍然为 `Online`，使用 `CHANGE DRAINER` 将该 Drainer 状态修改为 `paused`： + +{{< copyable "sql" >}} + +```sql +CHANGE DRAINER TO NODE_STATE ='paused' FOR NODE_ID 'drainer1'; +``` + +``` +Query OK, 0 rows affected (0.01 sec) +``` + +{{< copyable "sql" >}} + +```sql +SHOW DRAINER STATUS; +``` + +``` ++----------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++----------|----------------|--------|--------------------|---------------------| +| drainer1 | 127.0.0.3:8249 | Paused | 408553768673342532 | 2019-04-30 00:00:03 | ++----------|----------------|--------|--------------------|---------------------| +| drainer2 | 127.0.0.4:8249 | Online | 408553768673345531 | 2019-05-01 00:00:04 | ++----------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +## MySQL 兼容性 + +MySQL 无此功能。 + +## 另请参阅 + +* [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) +* [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) +* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) \ No newline at end of file diff --git a/sql-statements/sql-statement-change-pump.md b/sql-statements/sql-statement-change-pump.md new file mode 100644 index 000000000000..555afa7f893b --- /dev/null +++ b/sql-statements/sql-statement-change-pump.md @@ -0,0 +1,71 @@ +--- +title: CHANGE PUMP +summary: TiDB 数据库中 CHANGE PUMP 的使用概况。 +category: reference +--- + +# CHANGE DRAINER + +`CHANGE PUMP` 语句用于修改集群中 Pump 的状态信息。 + +> **注意：** +> +> Pump 在正常运行时会自动上报状态到 PD，仅在 Pump 处于异常情况时实际状态与 PD 中保存的状态信息不一致时， 使用该语句修改 PD 中存储的 Pump 状态信息。 + +## 示例 + +{{< copyable "sql" >}} + +```sql +SHOW PUMP STATUS; +``` + +``` ++--------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++--------|----------------|--------|--------------------|---------------------| +| pump1 | 127.0.0.1:8250 | Online | 408553768673342237 | 2019-04-30 00:00:01 | ++--------|----------------|--------|--------------------|---------------------| +| pump2 | 127.0.0.2:8250 | Online | 408553768673342335 | 2019-05-01 00:00:02 | ++--------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +可以看出 `pump1` 已经超过一天没有更新状态，该 Pump 处于异常状态，但是 State 仍然为 `Online`，使用 `CHANGE PUMP` 将该 Pump 状态修改为 `paused`： + +{{< copyable "sql" >}} + +```sql +CHANGE PUMP TO NODE_STATE ='paused' FOR NODE_ID 'pump1'; +``` + +``` +Query OK, 0 rows affected (0.01 sec) +``` + +{{< copyable "sql" >}} + +```sql +SHOW PUMP STATUS; +``` + +``` ++--------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++--------|----------------|--------|--------------------|---------------------| +| pump1 | 127.0.0.1:8250 | Paused | 408553768673342237 | 2019-04-30 00:00:01 | ++--------|----------------|--------|--------------------|---------------------| +| pump2 | 127.0.0.2:8250 | Online | 408553768673342335 | 2019-05-01 00:00:02 | ++--------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +## MySQL 兼容性 + +MySQL 无此功能。 + +## 另请参阅 + +* [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) +* [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) +* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) \ No newline at end of file diff --git a/sql-statements/sql-statement-show-drainer-status.md b/sql-statements/sql-statement-show-drainer-status.md new file mode 100644 index 000000000000..1c6cb8e2b3c6 --- /dev/null +++ b/sql-statements/sql-statement-show-drainer-status.md @@ -0,0 +1,38 @@ +--- +title: SHOW DRAINER STATUS +summary: TiDB 数据库中 SHOW DRAINER STATUS 的使用概况。 +category: reference +--- + +# SHOW DRAINER STATUS + +`SHOW DRAINER STATUS` 语句用于显示集群中所有 Drainer 的状态信息。 + +## 示例 + +{{< copyable "sql" >}} + +```sql +SHOW DRAINER STATUS; +``` + +``` ++----------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++----------|----------------|--------|--------------------|---------------------| +| drainer1 | 127.0.0.3:8249 | Online | 408553768673342532 | 2019-05-01 00:00:03 | ++----------|----------------|--------|--------------------|---------------------| +| drainer2 | 127.0.0.4:8249 | Online | 408553768673345531 | 2019-05-01 00:00:04 | ++----------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +## MySQL 兼容性 + +MySQL 无此功能。 + +## 另请参阅 + +* [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) +* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) +* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) diff --git a/sql-statements/sql-statement-show-pump-status.md b/sql-statements/sql-statement-show-pump-status.md new file mode 100644 index 000000000000..c8e57237b6ac --- /dev/null +++ b/sql-statements/sql-statement-show-pump-status.md @@ -0,0 +1,38 @@ +--- +title: SHOW PUMP STATUS +summary: TiDB 数据库中 SHOW PUMP STATUS 的使用概况。 +category: reference +--- + +# SHOW DRAINER STATUS + +`SHOW PUMP STATUS` 语句用于显示集群中所有 Pump 的状态信息。 + +## 示例 + +{{< copyable "sql" >}} + +```sql +SHOW PUMP STATUS; +``` + +``` ++--------|----------------|--------|--------------------|---------------------| +| NodeID | Address | State | Max_Commit_Ts | Update_Time | ++--------|----------------|--------|--------------------|---------------------| +| pump1 | 127.0.0.1:8250 | Online | 408553768673342237 | 2019-05-01 00:00:01 | ++--------|----------------|--------|--------------------|---------------------| +| pump2 | 127.0.0.2:8250 | Online | 408553768673342335 | 2019-05-01 00:00:02 | ++--------|----------------|--------|--------------------|---------------------| +2 rows in set (0.00 sec) +``` + +## MySQL 兼容性 + +MySQL 无此功能。 + +## 另请参阅 + +* [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) +* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) +* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) From 6dd5eaf9898bcd161ca63d1010d43308251692ad Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Mon, 25 May 2020 16:59:06 +0800 Subject: [PATCH 2/9] minor update --- sql-statements/sql-statement-change-drainer.md | 2 +- sql-statements/sql-statement-change-pump.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql-statements/sql-statement-change-drainer.md b/sql-statements/sql-statement-change-drainer.md index e4d4b590a239..44fa1d296296 100644 --- a/sql-statements/sql-statement-change-drainer.md +++ b/sql-statements/sql-statement-change-drainer.md @@ -10,7 +10,7 @@ category: reference > **注意：** > -> Drainer 在正常运行时会自动上报状态到 PD，仅在 Drainer 处于异常情况时实际状态与 PD 中保存的状态信息不一致时， 使用该语句修改 PD 中存储的 Drainer 状态信息。 +> Drainer 在正常运行时会自动上报状态到 PD，仅在 Drainer 处于异常情况时实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Drainer 状态信息。 ## 示例 diff --git a/sql-statements/sql-statement-change-pump.md b/sql-statements/sql-statement-change-pump.md index 555afa7f893b..614dcfec60ef 100644 --- a/sql-statements/sql-statement-change-pump.md +++ b/sql-statements/sql-statement-change-pump.md @@ -10,7 +10,7 @@ category: reference > **注意：** > -> Pump 在正常运行时会自动上报状态到 PD，仅在 Pump 处于异常情况时实际状态与 PD 中保存的状态信息不一致时， 使用该语句修改 PD 中存储的 Pump 状态信息。 +> Pump 在正常运行时会自动上报状态到 PD，仅在 Pump 处于异常情况时实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Pump 状态信息。 ## 示例 From 169e7483dc0a5b175fe4a9178547bb631606b6da Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Mon, 25 May 2020 18:42:42 +0800 Subject: [PATCH 3/9] update toc --- TOC.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TOC.md b/TOC.md index ae86b9e06f79..5da1f9183eb7 100644 --- a/TOC.md +++ b/TOC.md @@ -236,6 +236,8 @@ - [`ANALYZE TABLE`](/sql-statements/sql-statement-analyze-table.md) - [`BEGIN`](/sql-statements/sql-statement-begin.md) - [`COMMIT`](/sql-statements/sql-statement-commit.md) + - [`CHANGE DRAINER`](/sql-statements/sql-statement-change-drainer.md) + - [`CHANGE PUMP`](/sql-statements/sql-statement-change-pump.md) - [`CREATE DATABASE`](/sql-statements/sql-statement-create-database.md) - [`CREATE INDEX`](/sql-statements/sql-statement-create-index.md) - [`CREATE SEQUENCE`](/sql-statements/sql-statement-create-sequence.md) @@ -286,6 +288,7 @@ - [`SHOW CREATE TABLE`](/sql-statements/sql-statement-show-create-table.md) - [`SHOW CREATE USER`](/sql-statements/sql-statement-show-create-user.md) - [`SHOW DATABASES`](/sql-statements/sql-statement-show-databases.md) + - [`SHOW DRAINER STATUS`](/sql-statements/sql-statement-show-drainer-status.md) - [`SHOW ENGINES`](/sql-statements/sql-statement-show-engines.md) - [`SHOW ERRORS`](/sql-statements/sql-statement-show-errors.md) - [`SHOW [FULL] FIELDS FROM`](/sql-statements/sql-statement-show-fields-from.md) @@ -295,6 +298,7 @@ - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md) - [`SHOW PRIVILEGES`](/sql-statements/sql-statement-show-privileges.md) - [`SHOW [FULL] PROCESSSLIST`](/sql-statements/sql-statement-show-processlist.md) + - [`SHOW PUMP STATUS`](/sql-statements/sql-statement-show-pump-status.md) - [`SHOW SCHEMAS`](/sql-statements/sql-statement-show-schemas.md) - [`SHOW [FULL] TABLES`](/sql-statements/sql-statement-show-tables.md) - [`SHOW TABLE REGIONS`](/sql-statements/sql-statement-show-table-regions.md) From e33f41e5bec0c447aab084c9cbab0104c4c531b7 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Mon, 25 May 2020 20:35:15 +0800 Subject: [PATCH 4/9] add show master status --- TOC.md | 1 + .../sql-statement-show-master-status.md | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 sql-statements/sql-statement-show-master-status.md diff --git a/TOC.md b/TOC.md index 5da1f9183eb7..efac618ae30a 100644 --- a/TOC.md +++ b/TOC.md @@ -296,6 +296,7 @@ - [`SHOW INDEXES [FROM|IN]`](/sql-statements/sql-statement-show-indexes.md) - [`SHOW INDEX [FROM|IN]`](/sql-statements/sql-statement-show-index.md) - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md) + - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md) - [`SHOW PRIVILEGES`](/sql-statements/sql-statement-show-privileges.md) - [`SHOW [FULL] PROCESSSLIST`](/sql-statements/sql-statement-show-processlist.md) - [`SHOW PUMP STATUS`](/sql-statements/sql-statement-show-pump-status.md) diff --git a/sql-statements/sql-statement-show-master-status.md b/sql-statements/sql-statement-show-master-status.md new file mode 100644 index 000000000000..5eb631dadd83 --- /dev/null +++ b/sql-statements/sql-statement-show-master-status.md @@ -0,0 +1,37 @@ +--- +title: SHOW MASTER STATUS +summary: TiDB 数据库中 SHOW MASTER STATUS 的使用概况。 +category: reference +--- + +# SHOW MASTER STATUS + +`SHOW MASTER STATUS` 语句用于显示集群当前最新的 tso 信息。 + +## 示例 + +{{< copyable "sql" >}} + +```sql +SHOW MASTER STATUS; +``` + +``` ++-------------+--------------------+--------------+------------------+-------------------+ +| File | Position | Binlog_Do_DB | Binlog_Ignore_DB | Executed_Gtid_Set | ++-------------+--------------------+--------------+------------------+-------------------+ +| tidb-binlog | 416916363252072450 | | | | ++-------------+--------------------+--------------+------------------+-------------------+ +1 row in set (0.00 sec) +``` + +## MySQL 兼容性 + +`SHOW MASTER STATUS` 语句与 MySQL 兼容，但是执行结果有差异，在 MySQL 中执行结果为 binlog 的位置信息，而在 TiDB 中为最新的 tso 信息。 + +## 另请参阅 + +* [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) +* [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) +* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) +* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) From f977d2a35713691ac996889cdfd365de1e98efca Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Tue, 26 May 2020 14:07:07 +0800 Subject: [PATCH 5/9] Apply suggestions from code review Co-authored-by: toutdesuite --- sql-statements/sql-statement-change-drainer.md | 4 ++-- sql-statements/sql-statement-change-pump.md | 6 +++--- sql-statements/sql-statement-show-pump-status.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql-statements/sql-statement-change-drainer.md b/sql-statements/sql-statement-change-drainer.md index 44fa1d296296..5584e32bb118 100644 --- a/sql-statements/sql-statement-change-drainer.md +++ b/sql-statements/sql-statement-change-drainer.md @@ -39,7 +39,7 @@ SHOW DRAINER STATUS; CHANGE DRAINER TO NODE_STATE ='paused' FOR NODE_ID 'drainer1'; ``` -``` +```sql Query OK, 0 rows affected (0.01 sec) ``` @@ -68,4 +68,4 @@ MySQL 无此功能。 * [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) * [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) -* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) \ No newline at end of file +* [CHANGE PUMP STATUS](/sql-statements/sql-statement-change-pump.md) diff --git a/sql-statements/sql-statement-change-pump.md b/sql-statements/sql-statement-change-pump.md index 614dcfec60ef..b3400e36bd19 100644 --- a/sql-statements/sql-statement-change-pump.md +++ b/sql-statements/sql-statement-change-pump.md @@ -4,7 +4,7 @@ summary: TiDB 数据库中 CHANGE PUMP 的使用概况。 category: reference --- -# CHANGE DRAINER +# CHANGE PUMP `CHANGE PUMP` 语句用于修改集群中 Pump 的状态信息。 @@ -20,7 +20,7 @@ category: reference SHOW PUMP STATUS; ``` -``` +```sql +--------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +--------|----------------|--------|--------------------|---------------------| @@ -68,4 +68,4 @@ MySQL 无此功能。 * [SHOW PUMP STATUS](/sql-statements/sql-statement-show-pump-status.md) * [SHOW DRAINER STATUS](/sql-statements/sql-statement-show-drainer-status.md) -* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) \ No newline at end of file +* [CHANGE DRAINER STATUS](/sql-statements/sql-statement-change-drainer.md) diff --git a/sql-statements/sql-statement-show-pump-status.md b/sql-statements/sql-statement-show-pump-status.md index c8e57237b6ac..2528383d4a07 100644 --- a/sql-statements/sql-statement-show-pump-status.md +++ b/sql-statements/sql-statement-show-pump-status.md @@ -4,7 +4,7 @@ summary: TiDB 数据库中 SHOW PUMP STATUS 的使用概况。 category: reference --- -# SHOW DRAINER STATUS +# SHOW PUMP STATUS `SHOW PUMP STATUS` 语句用于显示集群中所有 Pump 的状态信息。 From 34bf3ec043165dfcc6cf140d277e34205d0411bb Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Tue, 26 May 2020 14:10:36 +0800 Subject: [PATCH 6/9] add sql --- sql-statements/sql-statement-change-drainer.md | 4 ++-- sql-statements/sql-statement-change-pump.md | 4 ++-- sql-statements/sql-statement-show-drainer-status.md | 2 +- sql-statements/sql-statement-show-master-status.md | 2 +- sql-statements/sql-statement-show-pump-status.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sql-statements/sql-statement-change-drainer.md b/sql-statements/sql-statement-change-drainer.md index 5584e32bb118..f53837b4f77e 100644 --- a/sql-statements/sql-statement-change-drainer.md +++ b/sql-statements/sql-statement-change-drainer.md @@ -20,7 +20,7 @@ category: reference SHOW DRAINER STATUS; ``` -``` +```sql +----------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +----------|----------------|--------|--------------------|---------------------| @@ -49,7 +49,7 @@ Query OK, 0 rows affected (0.01 sec) SHOW DRAINER STATUS; ``` -``` +```sql +----------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +----------|----------------|--------|--------------------|---------------------| diff --git a/sql-statements/sql-statement-change-pump.md b/sql-statements/sql-statement-change-pump.md index b3400e36bd19..d3270870d645 100644 --- a/sql-statements/sql-statement-change-pump.md +++ b/sql-statements/sql-statement-change-pump.md @@ -39,7 +39,7 @@ SHOW PUMP STATUS; CHANGE PUMP TO NODE_STATE ='paused' FOR NODE_ID 'pump1'; ``` -``` +```sql Query OK, 0 rows affected (0.01 sec) ``` @@ -49,7 +49,7 @@ Query OK, 0 rows affected (0.01 sec) SHOW PUMP STATUS; ``` -``` +```sql +--------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +--------|----------------|--------|--------------------|---------------------| diff --git a/sql-statements/sql-statement-show-drainer-status.md b/sql-statements/sql-statement-show-drainer-status.md index 1c6cb8e2b3c6..86e2dcb15681 100644 --- a/sql-statements/sql-statement-show-drainer-status.md +++ b/sql-statements/sql-statement-show-drainer-status.md @@ -16,7 +16,7 @@ category: reference SHOW DRAINER STATUS; ``` -``` +```sql +----------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +----------|----------------|--------|--------------------|---------------------| diff --git a/sql-statements/sql-statement-show-master-status.md b/sql-statements/sql-statement-show-master-status.md index 5eb631dadd83..1d4562c122ad 100644 --- a/sql-statements/sql-statement-show-master-status.md +++ b/sql-statements/sql-statement-show-master-status.md @@ -16,7 +16,7 @@ category: reference SHOW MASTER STATUS; ``` -``` +```sql +-------------+--------------------+--------------+------------------+-------------------+ | File | Position | Binlog_Do_DB | Binlog_Ignore_DB | Executed_Gtid_Set | +-------------+--------------------+--------------+------------------+-------------------+ diff --git a/sql-statements/sql-statement-show-pump-status.md b/sql-statements/sql-statement-show-pump-status.md index 2528383d4a07..fb99c7a663eb 100644 --- a/sql-statements/sql-statement-show-pump-status.md +++ b/sql-statements/sql-statement-show-pump-status.md @@ -16,7 +16,7 @@ category: reference SHOW PUMP STATUS; ``` -``` +```sql +--------|----------------|--------|--------------------|---------------------| | NodeID | Address | State | Max_Commit_Ts | Update_Time | +--------|----------------|--------|--------------------|---------------------| From b3cfa729a51e6a48eeb2ab455daa10f260b9d45d Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Tue, 26 May 2020 15:28:39 +0800 Subject: [PATCH 7/9] Update sql-statements/sql-statement-change-drainer.md Co-authored-by: toutdesuite --- sql-statements/sql-statement-change-drainer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-change-drainer.md b/sql-statements/sql-statement-change-drainer.md index f53837b4f77e..d6c0c0615291 100644 --- a/sql-statements/sql-statement-change-drainer.md +++ b/sql-statements/sql-statement-change-drainer.md @@ -10,7 +10,7 @@ category: reference > **注意：** > -> Drainer 在正常运行时会自动上报状态到 PD，仅在 Drainer 处于异常情况时实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Drainer 状态信息。 +> Drainer 在正常运行时会自动上报状态到 PD，仅在 Drainer 处于异常情况导致实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Drainer 状态信息。 ## 示例 From 1b4daca6fe58a2ad066c69b5699b845c4e96973d Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Tue, 26 May 2020 15:32:23 +0800 Subject: [PATCH 8/9] Update sql-statements/sql-statement-change-pump.md Co-authored-by: toutdesuite --- sql-statements/sql-statement-change-pump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-statements/sql-statement-change-pump.md b/sql-statements/sql-statement-change-pump.md index d3270870d645..16a54160bfc3 100644 --- a/sql-statements/sql-statement-change-pump.md +++ b/sql-statements/sql-statement-change-pump.md @@ -10,7 +10,7 @@ category: reference > **注意：** > -> Pump 在正常运行时会自动上报状态到 PD，仅在 Pump 处于异常情况时实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Pump 状态信息。 +> Pump 在正常运行时会自动上报状态到 PD，仅在 Pump 处于异常情况导致实际状态与 PD 中保存的状态信息不一致时，使用该语句修改 PD 中存储的 Pump 状态信息。 ## 示例 From ed5d8c48f2a0a58ad88371f68ec017e0b55a5f00 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Tue, 26 May 2020 16:00:32 +0800 Subject: [PATCH 9/9] Apply suggestions from code review Co-authored-by: toutdesuite --- sql-statements/sql-statement-show-master-status.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql-statements/sql-statement-show-master-status.md b/sql-statements/sql-statement-show-master-status.md index 1d4562c122ad..2e33d0b3da4a 100644 --- a/sql-statements/sql-statement-show-master-status.md +++ b/sql-statements/sql-statement-show-master-status.md @@ -6,7 +6,7 @@ category: reference # SHOW MASTER STATUS -`SHOW MASTER STATUS` 语句用于显示集群当前最新的 tso 信息。 +`SHOW MASTER STATUS` 语句用于显示集群当前最新的 TSO 信息。 ## 示例 @@ -27,7 +27,7 @@ SHOW MASTER STATUS; ## MySQL 兼容性 -`SHOW MASTER STATUS` 语句与 MySQL 兼容，但是执行结果有差异，在 MySQL 中执行结果为 binlog 的位置信息，而在 TiDB 中为最新的 tso 信息。 +`SHOW MASTER STATUS` 语句与 MySQL 兼容，但是执行结果有差异，在 MySQL 中执行结果为 binlog 的位置信息，而在 TiDB 中为最新的 TSO 信息。 ## 另请参阅