From 6064f2801dd01693206c9e3ebb6e1128ded4005a Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Thu, 27 Nov 2025 12:05:47 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #22098 Signed-off-by: ti-chi-bot --- dumpling-overview.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dumpling-overview.md b/dumpling-overview.md index d467d931f245a..659ead88a18c9 100644 --- a/dumpling-overview.md +++ b/dumpling-overview.md @@ -360,7 +360,11 @@ SET GLOBAL tidb_gc_life_time = '10m'; | `--cert` | The address of the client certificate file for TLS connection | | `--key` | The address of the client private key file for TLS connection | | `--csv-delimiter` | Delimiter of character type variables in CSV files | '"' | +<<<<<<< HEAD | `--csv-separator` | Separator of each value in CSV files. It is not recommended to use the default ‘,’. It is recommended to use ‘\|+\|’ or other uncommon character combinations| ',' | ',' | +======= +| `--csv-separator` | Separator for each value in CSV files. If your data contains commas, it is recommended to use a combination of uncommon characters as the separator. Invisible characters are also supported, for example: `--csv-separator $'\001'`. | ',' | +>>>>>>> 445d5c8402 (dumpling: clarify description about `--csv-separator` (#22098)) | `--csv-null-value` | Representation of null values in CSV files | "\\N" | | `--escape-backslash` | Use backslash (`\`) to escape special characters in the export file | true | | `--output-filename-template` | The filename templates represented in the format of [golang template](https://golang.org/pkg/text/template/#hdr-Arguments)
Support the `{{.DB}}`, `{{.Table}}`, and `{{.Index}}` arguments
The three arguments represent the database name, table name, and chunk ID of the data file | '{{.DB}}.{{.Table}}.{{.Index}}' | From c6723168063294ec7531795e9e0494c1b37d3e36 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Thu, 27 Nov 2025 12:32:33 +0800 Subject: [PATCH 2/2] Update dumpling-overview.md Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- dumpling-overview.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dumpling-overview.md b/dumpling-overview.md index 659ead88a18c9..ec1cbc63ca5bf 100644 --- a/dumpling-overview.md +++ b/dumpling-overview.md @@ -360,11 +360,7 @@ SET GLOBAL tidb_gc_life_time = '10m'; | `--cert` | The address of the client certificate file for TLS connection | | `--key` | The address of the client private key file for TLS connection | | `--csv-delimiter` | Delimiter of character type variables in CSV files | '"' | -<<<<<<< HEAD -| `--csv-separator` | Separator of each value in CSV files. It is not recommended to use the default ‘,’. It is recommended to use ‘\|+\|’ or other uncommon character combinations| ',' | ',' | -======= -| `--csv-separator` | Separator for each value in CSV files. If your data contains commas, it is recommended to use a combination of uncommon characters as the separator. Invisible characters are also supported, for example: `--csv-separator $'\001'`. | ',' | ->>>>>>> 445d5c8402 (dumpling: clarify description about `--csv-separator` (#22098)) +| `--csv-separator` | Separator for each value in CSV files. If your data contains commas, it is recommended to use a combination of uncommon characters as the separator. Invisible characters are also supported, for example: `--csv-separator $\'\001\'`. | ',' | | `--csv-null-value` | Representation of null values in CSV files | "\\N" | | `--escape-backslash` | Use backslash (`\`) to escape special characters in the export file | true | | `--output-filename-template` | The filename templates represented in the format of [golang template](https://golang.org/pkg/text/template/#hdr-Arguments)
Support the `{{.DB}}`, `{{.Table}}`, and `{{.Index}}` arguments
The three arguments represent the database name, table name, and chunk ID of the data file | '{{.DB}}.{{.Table}}.{{.Index}}' |