Skip to content

Commit 06f3926

Browse files
committed
Merge remote-tracking branch 'upstream/master' into ttiup-tocs-reste
2 parents 3bbb7d9 + 2c1d558 commit 06f3926

File tree

66 files changed

+3324
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3324
-58
lines changed

dumpling-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ Examples:
237237
The exported file is stored in the `./export-<current local time>` directory by default. Commonly used options are as follows:
238238
239239
- `-o` is used to select the directory where the exported files are stored.
240-
- `-F` option is used to specify the maximum size of a single file (the unit here is `MiB`; inputs like `5GiB` or `8KB` are also acceptable).
240+
- `-F` option is used to specify the maximum size of a single file (the unit here is `MiB`; inputs like `5GiB` or `8KB` are also acceptable). It is recommended to keep its value to 256 MiB or less if you plan to use TiDB Lightning to load this file into a TiDB instance.
241241
- `-r` option is used to specify the maximum number of records (or the number of rows in the database) for a single file. When it is enabled, Dumpling enables concurrency in the table to improve the speed of exporting large tables.
242242
243243
With the above options specified, Dumpling can have a higher degree of parallelism.

error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ TiDB is compatible with the error codes in MySQL, and in most cases returns the
9898

9999
* Error Number: 8027
100100

101-
The table schema version is outdated. TiDB uses the F1 online schema change algorithm to execute DDL statements. When the table schema version of the TiDB server is earlier than that of the entire system, this error is returned if you execute a SQL statement.
101+
The table schema version is outdated. TiDB applies schema changes online. When the table schema version of the TiDB server is earlier than that of the entire system, this error is returned if you execute a SQL statement.
102102

103103
When this error occurs, check the network between the TiDB server and the PD Leader.
104104

sql-statements/sql-statement-admin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ admin show ddl jobs 5 where state!='synced' and db_name='test';
194194
* `JOB_TYPE`: the type of the DDL operations.
195195
* `SCHEMA_STATE`: the current state of the schema. If the `JOB_TYPE` is `add index`, it is the state of the index; if the `JOB_TYPE` is `add column`, it is the state of the column; if the `JOB_TYPE` is `create table`, it is the state of the table. The common states include:
196196
* `none`: it indicates not existing. When the `drop` or `create` operation fails and rolls back, it usually becomes the `none` state.
197-
* `delete only`, `write only`, `delete reorganization`, `write reorganization`: these four states are intermediate states. For details, see the paper [Online, Asynchronous Schema Change in F1](https://static.googleusercontent.com/media/research.google.com/zh-CN//pubs/archive/41376.pdf). These states are not visible in common operations, because the conversion from the intermediate states is so quick. You can see the `write reorganization` state only in `add index` operations, which means that the index data is being added.
197+
* `delete only`, `write only`, `delete reorganization`, `write reorganization`: these four states are intermediate states. These states are not visible in common operations, because the conversion from the intermediate states is so quick. You can see the `write reorganization` state only in `add index` operations, which means that the index data is being added.
198198
* `public`: it indicates existing and usable. When operations like `create table` and `add index/column` are finished, it usually becomes the `public` state, which means that the created table/column/index can be normally read and written now.
199199
* `SCHEMA_ID`: the ID of the database on which the DDL operations are performed.
200200
* `TABLE_ID`: the ID of the table on which the DDL operations are performed.

tiup/tiup-cluster-topology-reference.md

Lines changed: 769 additions & 0 deletions
Large diffs are not rendered by default.

tiup/tiup-command-clean.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The `tiup clean` command is used to clear the data generated during component op
88

99
## Syntax
1010

11-
```sh
11+
```shell
1212
tiup clean [name] [flags]
1313
```
1414

tiup/tiup-command-completion.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If you want to complete `bash` commands, you need to install `bash-completion` f
1313

1414
## Syntax
1515

16-
```sh
16+
```shell
1717
tiup completion <shell>
1818
```
1919

@@ -25,7 +25,7 @@ tiup completion <shell>
2525

2626
Write the `tiup completion bash` command into a file and source the file in `.bash_profile`. See the following example:
2727

28-
```sh
28+
```shell
2929
tiup completion bash > ~/.tiup.completion.bash
3030

3131
printf "
@@ -38,6 +38,6 @@ source $HOME/.bash_profile
3838

3939
### zsh
4040

41-
```sh
41+
```shell
4242
tiup completion zsh > "${fpath[1]}/_tiup"
4343
```

tiup/tiup-command-env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ TiUP provides users with flexible and customized interfaces, some of which are i
88

99
## Syntax
1010

11-
```sh
11+
```shell
1212
tiup env [name1...N]
1313
```
1414

tiup/tiup-command-help.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The TiUP command-line interface provides users with a wealth of help information
88

99
## Syntax
1010

11-
```sh
11+
```shell
1212
tiup help [command]
1313
```
1414

tiup/tiup-command-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The `tiup install` command is used for component installation. It downloads the
88

99
## Syntax
1010

11-
```sh
11+
```shell
1212
tiup install <component1>[:version] [component2...N] [flags]
1313
```
1414

tiup/tiup-command-list.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The command `tiup list` is used to get the list of available components of a mir
88

99
## Syntax
1010

11-
```sh
11+
```shell
1212
tiup list [component] [flags]
1313
```
1414

@@ -20,19 +20,19 @@ tiup list [component] [flags]
2020

2121
- Displays all components. By default, TiUP does not show hidden components.
2222
- Data type: `BOOLEAN`
23-
- Default: false
23+
- This option is disabled by default and its default value is `false`. To enable this option, you can add this option to the command, and pass the `true` value or do not pass any value.
2424

2525
### --installed
2626

2727
- Only displays components and versions that have been installed.
2828
- Data type: `BOOLEAN`
29-
- Default: false
29+
- This option is disabled by default and its default value is `false`. To enable this option, you can add this option to the command, and pass the `true` value or do not pass any value.
3030

3131
### --verbose
3232

3333
- Displays installed component versions in the components list.
3434
- Data type: `BOOLEAN`
35-
- Default: false
35+
- This option is disabled by default and its default value is `false`. To enable this option, you can add this option to the command, and pass the `true` value or do not pass any value.
3636

3737
## Outputs
3838

0 commit comments

Comments
 (0)