From 9c4701aefec9127d3853ede51e4ae72deecb8122 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Tue, 11 Jun 2024 19:16:31 +0800 Subject: [PATCH 1/4] br: refine description for snapshot backup (#17856) --- br/backup-and-restore-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/backup-and-restore-overview.md b/br/backup-and-restore-overview.md index 5e1b4d7cb5e92..8e5039455b5f9 100644 --- a/br/backup-and-restore-overview.md +++ b/br/backup-and-restore-overview.md @@ -94,7 +94,7 @@ Corresponding to the backup features, you can perform two types of restore: full #### Restore performance and impact on TiDB clusters -- Data restore is performed at a scalable speed. Generally, the speed is 100 MiB/s per TiKV node. `br` only supports restoring data to a new cluster and uses the resources of the target cluster as much as possible. For more details, see [Restore performance and impact](/br/br-snapshot-guide.md#performance-and-impact-of-snapshot-restore). +- Data restore is performed at a scalable speed. Generally, the speed is 100 MiB/s per TiKV node. For more details, see [Restore performance and impact](/br/br-snapshot-guide.md#performance-and-impact-of-snapshot-restore). - On each TiKV node, PITR can restore log data at 30 GiB/h. For more details, see [PITR performance and impact](/br/br-pitr-guide.md#performance-capabilities-of-pitr). ## Backup storage From 239dbcea9b54df37eaf0899e822c4ba35c8c357b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Wed, 12 Jun 2024 04:40:29 +0200 Subject: [PATCH 2/4] dxf: link to data type (#17703) --- tidb-distributed-execution-framework.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tidb-distributed-execution-framework.md b/tidb-distributed-execution-framework.md index a25317f755863..d9f5d4fb75f9e 100644 --- a/tidb-distributed-execution-framework.md +++ b/tidb-distributed-execution-framework.md @@ -44,7 +44,7 @@ The DXF can only schedule up to 16 tasks (including [`ADD INDEX`](/sql-statement ## `ADD INDEX` limitation -- Adding indexes on columns with the `TIMESTAMP` data type through the DXF is not supported, because it might lead to inconsistency between the index and the data. +- Adding indexes on columns with the [`TIMESTAMP`](/data-type-date-and-time.md#timestamp-type) data type through the DXF is not supported, because it might lead to inconsistency between the index and the data. ## Prerequisites From cb3895f3b53110d1add57d2325abf666d4e00759 Mon Sep 17 00:00:00 2001 From: xixirangrang Date: Wed, 12 Jun 2024 14:13:29 +0800 Subject: [PATCH 3/4] tidb lightning: expose [tidb.session-vars] in lightning config (#17864) --- tidb-lightning/tidb-lightning-configuration.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tidb-lightning/tidb-lightning-configuration.md b/tidb-lightning/tidb-lightning-configuration.md index 2d14f5cc4ce5c..5b2d6b5fb5991 100644 --- a/tidb-lightning/tidb-lightning-configuration.md +++ b/tidb-lightning/tidb-lightning-configuration.md @@ -400,6 +400,10 @@ distsql-scan-concurrency = 15 index-serial-scan-concurrency = 20 checksum-table-concurrency = 2 +# Sets other TiDB session variables +# [tidb.session-vars] +# tidb_enable_clustered_index = "OFF" + # The default SQL mode used to parse and execute the SQL statements. sql-mode = "ONLY_FULL_GROUP_BY,NO_AUTO_CREATE_USER" # Sets maximum packet size allowed for SQL connections. From e0860aebc7021d9124611e92f5c61a149f5ac6e7 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Wed, 12 Jun 2024 14:17:59 +0800 Subject: [PATCH 4/4] fix format in external-storage-uri.md (#17862) --- external-storage-uri.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external-storage-uri.md b/external-storage-uri.md index 090629e331479..cb99bcb77018f 100644 --- a/external-storage-uri.md +++ b/external-storage-uri.md @@ -26,7 +26,7 @@ The basic format of the URI is as follows: - `endpoint`: Specifies the URL of custom endpoint for S3-compatible services (for example, ``). - `force-path-style`: Use path style access rather than virtual hosted style access (defaults to `true`). - `storage-class`: Specifies the storage class of the uploaded objects (for example, `STANDARD` or `STANDARD_IA`). - - `sse`: Specifies the server-side encryption algorithm used to encrypt the uploaded objects (value options: ``, `AES256`, or `aws:kms`). + - `sse`: Specifies the server-side encryption algorithm used to encrypt the uploaded objects (value options: empty, `AES256`, or `aws:kms`). - `sse-kms-key-id`: Specifies the KMS ID if `sse` is set to `aws:kms`. - `acl`: Specifies the canned ACL of the uploaded objects (for example, `private` or `authenticated-read`). - `role-arn`: When you need to access Amazon S3 data from a third party using a specified [IAM role](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html), you can specify the corresponding [Amazon Resource Name (ARN)](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html) of the IAM role with the `role-arn` URL query parameter, such as `arn:aws:iam::888888888888:role/my-role`. For more information about using an IAM role to access Amazon S3 data from a third party, see [AWS documentation](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_common-scenarios_third-party.html). BR supports this parameter starting from v7.6.0.