Merge remote-tracking branch 'upstream/master'

.github/pull_request_template.md

@@ -28,14 +28,12 @@ For details, see [tips for choosing the affected versions](https://github.com/pi
 - [ ] v8.5 (TiDB 8.5 versions)
 - [ ] v8.4 (TiDB 8.4 versions)
 - [ ] v8.3 (TiDB 8.3 versions)
-- [ ] v8.2 (TiDB 8.2 versions)
 - [ ] v8.1 (TiDB 8.1 versions)
 - [ ] v7.5 (TiDB 7.5 versions)
 - [ ] v7.1 (TiDB 7.1 versions)
 - [ ] v6.5 (TiDB 6.5 versions)
 - [ ] v6.1 (TiDB 6.1 versions)
 - [ ] v5.4 (TiDB 5.4 versions)
-- [ ] v5.3 (TiDB 5.3 versions)
 
 ### What is the related PR or file link(s)?
 

README.md

@@ -31,7 +31,7 @@ Currently, we maintain the following versions of TiDB documentation in different
 | [`release-8.5`](https://github.com/pingcap/docs/tree/release-8.5) | 8.5 LTS (Long-Term Support) |
 | [`release-8.4`](https://github.com/pingcap/docs/tree/release-8.4) | 8.4 Development Milestone Release |
 | [`release-8.3`](https://github.com/pingcap/docs/tree/release-8.3) | 8.3 Development Milestone Release |
-| [`release-8.2`](https://github.com/pingcap/docs/tree/release-8.2) | 8.2 Development Milestone Release |
+| [`release-8.2`](https://github.com/pingcap/docs/tree/release-8.2) | 8.2 Development Milestone Release (Archived documentation, no longer updated) |
 | [`release-8.1`](https://github.com/pingcap/docs/tree/release-8.1) | 8.1 LTS (Long-Term Support) |
 | [`release-8.0`](https://github.com/pingcap/docs/tree/release-8.0) | 8.0 Development Milestone Release (Archived documentation, no longer updated) |
 | [`release-7.6`](https://github.com/pingcap/docs/tree/release-7.6) | 7.6 Development Milestone Release (Archived documentation, no longer updated) |
@@ -49,7 +49,7 @@ Currently, we maintain the following versions of TiDB documentation in different
 | [`release-6.1`](https://github.com/pingcap/docs/tree/release-6.1) | 6.1 LTS (Long-Term Support) version |
 | [`release-6.0`](https://github.com/pingcap/docs/tree/release-6.0) | 6.0 Development Milestone Release (Archived documentation, no longer updated) |
 | [`release-5.4`](https://github.com/pingcap/docs/tree/release-5.4) | 5.4 stable version |
-| [`release-5.3`](https://github.com/pingcap/docs/tree/release-5.3) | 5.3 stable version |
+| [`release-5.3`](https://github.com/pingcap/docs/tree/release-5.3) | 5.3 stable version (Archived documentation, no longer updated) |
 | [`release-5.2`](https://github.com/pingcap/docs/tree/release-5.2) | 5.2 stable version (Archived documentation, no longer updated) |
 | [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 stable version (Archived documentation, no longer updated) |
 | [`release-5.0`](https://github.com/pingcap/docs/tree/release-5.0) | 5.0 stable version (Archived documentation, no longer updated) |

TOC-tidb-cloud.md

@@ -10,7 +10,7 @@
   - [Roadmap](/tidb-cloud/tidb-cloud-roadmap.md)
 - Get Started
   - [Try Out TiDB Cloud](/tidb-cloud/tidb-cloud-quickstart.md)
-  - [Try Out TiDB + AI](/vector-search-get-started-using-python.md)
+  - [Try Out TiDB + AI](/vector-search/vector-search-get-started-using-python.md)
   - [Try Out HTAP](/tidb-cloud/tidb-cloud-htap-quickstart.md)
   - [Try Out TiDB Cloud CLI](/tidb-cloud/get-started-with-cli.md)
   - [Perform a PoC](/tidb-cloud/tidb-cloud-poc.md)
@@ -241,27 +241,27 @@
 - Explore Data
   - [Chat2Query (Beta) in SQL Editor](/tidb-cloud/explore-data-with-chat2query.md)
 - Vector Search (Beta)
-  - [Overview](/vector-search-overview.md)
+  - [Overview](/vector-search/vector-search-overview.md)
   - Get Started
-    - [Get Started with SQL](/vector-search-get-started-using-sql.md)
-    - [Get Started with Python](/vector-search-get-started-using-python.md)
+    - [Get Started with SQL](/vector-search/vector-search-get-started-using-sql.md)
+    - [Get Started with Python](/vector-search/vector-search-get-started-using-python.md)
   - Integrations
-    - [Overview](/vector-search-integration-overview.md)
+    - [Overview](/vector-search/vector-search-integration-overview.md)
     - AI Frameworks
-      - [LlamaIndex](/vector-search-integrate-with-llamaindex.md)
-      - [Langchain](/vector-search-integrate-with-langchain.md)
+      - [LlamaIndex](/vector-search/vector-search-integrate-with-llamaindex.md)
+      - [Langchain](/vector-search/vector-search-integrate-with-langchain.md)
     - Embedding Models/Services
-      - [Jina AI](/vector-search-integrate-with-jinaai-embedding.md)
+      - [Jina AI](/vector-search/vector-search-integrate-with-jinaai-embedding.md)
     - ORM Libraries
-      - [SQLAlchemy](/vector-search-integrate-with-sqlalchemy.md)
-      - [peewee](/vector-search-integrate-with-peewee.md)
-      - [Django ORM](/vector-search-integrate-with-django-orm.md)
+      - [SQLAlchemy](/vector-search/vector-search-integrate-with-sqlalchemy.md)
+      - [peewee](/vector-search/vector-search-integrate-with-peewee.md)
+      - [Django ORM](/vector-search/vector-search-integrate-with-django-orm.md)
   - Reference
-    - [Vector Data Types](/vector-search-data-types.md)
-    - [Vector Functions and Operators](/vector-search-functions-and-operators.md)
-    - [Vector Index](/vector-search-index.md)
-  - [Improve Performance](/vector-search-improve-performance.md)
-  - [Limitations](/vector-search-limitations.md)
+    - [Vector Data Types](/vector-search/vector-search-data-types.md)
+    - [Vector Functions and Operators](/vector-search/vector-search-functions-and-operators.md)
+    - [Vector Index](/vector-search/vector-search-index.md)
+  - [Improve Performance](/vector-search/vector-search-improve-performance.md)
+  - [Limitations](/vector-search/vector-search-limitations.md)
   - [Changelogs](/tidb-cloud/vector-search-changelogs.md)
 - Data Service (Beta)
   - [Overview](/tidb-cloud/data-service-overview.md)

TOC.md

@@ -82,23 +82,23 @@
       - [Stale Read](/develop/dev-guide-use-stale-read.md)
     - [HTAP Queries](/develop/dev-guide-hybrid-oltp-and-olap-queries.md)
   - Vector Search
-    - [Overview](/vector-search-overview.md)
+    - [Overview](/vector-search/vector-search-overview.md)
     - Get Started
-      - [Get Started with SQL](/vector-search-get-started-using-sql.md)
-      - [Get Started with Python](/vector-search-get-started-using-python.md)
+      - [Get Started with SQL](/vector-search/vector-search-get-started-using-sql.md)
+      - [Get Started with Python](/vector-search/vector-search-get-started-using-python.md)
     - Integrations
-      - [Overview](/vector-search-integration-overview.md)
+      - [Overview](/vector-search/vector-search-integration-overview.md)
       - AI Frameworks
-        - [LlamaIndex](/vector-search-integrate-with-llamaindex.md)
-        - [Langchain](/vector-search-integrate-with-langchain.md)
+        - [LlamaIndex](/vector-search/vector-search-integrate-with-llamaindex.md)
+        - [Langchain](/vector-search/vector-search-integrate-with-langchain.md)
       - Embedding Models/Services
-        - [Jina AI](/vector-search-integrate-with-jinaai-embedding.md)
+        - [Jina AI](/vector-search/vector-search-integrate-with-jinaai-embedding.md)
       - ORM Libraries
-        - [SQLAlchemy](/vector-search-integrate-with-sqlalchemy.md)
-        - [peewee](/vector-search-integrate-with-peewee.md)
-        - [Django](/vector-search-integrate-with-django-orm.md)
-    - [Improve Performance](/vector-search-improve-performance.md)
-    - [Limitations](/vector-search-limitations.md)
+        - [SQLAlchemy](/vector-search/vector-search-integrate-with-sqlalchemy.md)
+        - [peewee](/vector-search/vector-search-integrate-with-peewee.md)
+        - [Django](/vector-search/vector-search-integrate-with-django-orm.md)
+    - [Improve Performance](/vector-search/vector-search-improve-performance.md)
+    - [Limitations](/vector-search/vector-search-limitations.md)
   - Transaction
     - [Overview](/develop/dev-guide-transaction-overview.md)
     - [Optimistic and Pessimistic Transactions](/develop/dev-guide-optimistic-and-pessimistic-transaction.md)
@@ -891,7 +891,7 @@
       - [Date and Time Types](/data-type-date-and-time.md)
       - [String Types](/data-type-string.md)
       - [JSON Type](/data-type-json.md)
-      - [Vector Types](/vector-search-data-types.md)
+      - [Vector Types](/vector-search/vector-search-data-types.md)
     - Functions and Operators
       - [Overview](/functions-and-operators/functions-and-operators-overview.md)
       - [Type Conversion in Expression Evaluation](/functions-and-operators/type-conversion-in-expression-evaluation.md)
@@ -905,7 +905,7 @@
       - [Encryption and Compression Functions](/functions-and-operators/encryption-and-compression-functions.md)
       - [Locking Functions](/functions-and-operators/locking-functions.md)
       - [Information Functions](/functions-and-operators/information-functions.md)
-      - [Vector Functions and Operators](/vector-search-functions-and-operators.md)
+      - [Vector Functions and Operators](/vector-search/vector-search-functions-and-operators.md)
       - JSON Functions
         - [Overview](/functions-and-operators/json-functions.md)
         - [Functions That Create JSON](/functions-and-operators/json-functions/json-functions-create.md)
@@ -926,7 +926,7 @@
       - [TiDB Specific Functions](/functions-and-operators/tidb-functions.md)
       - [Comparisons between Functions and Syntax of Oracle and TiDB](/oracle-functions-to-tidb.md)
     - [Clustered Indexes](/clustered-indexes.md)
-    - [Vector Index](/vector-search-index.md)
+    - [Vector Index](/vector-search/vector-search-index.md)
     - [Constraints](/constraints.md)
     - [Generated Columns](/generated-columns.md)
     - [SQL Mode](/sql-mode.md)
@@ -1092,6 +1092,7 @@
   - v7.6
     - [7.6.0-DMR](/releases/release-7.6.0.md)
   - v7.5
+    - [7.5.5](/releases/release-7.5.5.md)
     - [7.5.4](/releases/release-7.5.4.md)
     - [7.5.3](/releases/release-7.5.3.md)
     - [7.5.2](/releases/release-7.5.2.md)

basic-features.md

@@ -28,15 +28,15 @@ You can try out TiDB features on [TiDB Playground](https://play.tidbcloud.com/?u
 | [Date and time types](/data-type-date-and-time.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [String types](/data-type-string.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [JSON type](/data-type-json.md) | Y | Y | Y | Y | Y | E | E | E | E | E |
-| [Vectort types](/vector-search-data-types.md) | E | N | N | N | N | N | N | N | N | N |
+| [Vectort types](/vector-search/vector-search-data-types.md) | E | N | N | N | N | N | N | N | N | N |
 | [Control flow functions](/functions-and-operators/control-flow-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [String functions](/functions-and-operators/string-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [Numeric functions and operators](/functions-and-operators/numeric-functions-and-operators.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [Date and time functions](/functions-and-operators/date-and-time-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [Bit functions and operators](/functions-and-operators/bit-functions-and-operators.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [Cast functions and operators](/functions-and-operators/cast-functions-and-operators.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [Encryption and compression functions](/functions-and-operators/encryption-and-compression-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
-| [Vector functions and operators](/vector-search-functions-and-operators.md) | E | N | N | N | N | N | N | N | N | N |
+| [Vector functions and operators](/vector-search/vector-search-functions-and-operators.md) | E | N | N | N | N | N | N | N | N | N |
 | [Information functions](/functions-and-operators/information-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
 | [JSON functions](/functions-and-operators/json-functions.md) | Y | Y | Y | Y | Y | E | E | E | E | E |
 | [Aggregation functions](/functions-and-operators/aggregate-group-by-functions.md) | Y | Y | Y | Y | Y | Y | Y | Y | Y | Y |
@@ -67,7 +67,7 @@ You can try out TiDB features on [TiDB Playground](https://play.tidbcloud.com/?u
 | [Foreign key](/foreign-key.md) | Y | E | E | E | N | N | N | N | N | N |
 | [TiFlash late materialization](/tiflash/tiflash-late-materialization.md) | Y | Y | Y | Y | N | N | N | N | N | N |
 | [Global index](/partitioned-table.md#global-indexes) | Y |  N | N  | N | N | N | N | N | N | N |
-| [Vector index](/vector-search-index.md) | E | N | N | N | N | N | N | N | N | N |
+| [Vector index](/vector-search/vector-search-index.md) | E | N | N | N | N | N | N | N | N | N |
 
 ## SQL statements
 
@@ -98,7 +98,7 @@ You can try out TiDB features on [TiDB Playground](https://play.tidbcloud.com/?u
 
 | Advanced SQL features | 8.5 | 8.1 | 7.5 | 7.1 | 6.5 | 6.1 | 5.4 | 5.3 | 5.2 | 5.1 |
 |---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| [Vector search](/vector-search-overview.md) |  E |  N |  N  | N | N | N | N | N | N | N |
+| [Vector search](/vector-search/vector-search-overview.md) |  E |  N |  N  | N | N | N | N | N | N | N |
 | [Prepared statement cache](/sql-prepared-plan-cache.md) | Y | Y | Y | Y | Y | Y | Y | Y | E | E |
 | [Non-prepared statement cache](/sql-non-prepared-plan-cache.md) | Y | Y | Y | E | N | N | N | N | N | N |
 | [Instance-level execution plan cache](/system-variables.md#tidb_enable_instance_plan_cache-new-in-v840) | E | N | N | N | N | N | N | N | N | N |

br/backup-and-restore-overview.md

@@ -118,7 +118,7 @@ Backup and restore might go wrong when some TiDB features are enabled or disable
 | Global temporary tables | | Make sure that you are using v5.3.0 or a later version of BR to back up and restore data. Otherwise, an error occurs in the definition of the backed global temporary tables. |
 | TiDB Lightning Physical Import| | If the upstream database uses the physical import mode of TiDB Lightning, data cannot be backed up in log backup. It is recommended to perform a full backup after the data import. For more information, see [When the upstream database imports data using TiDB Lightning in the physical import mode, the log backup feature becomes unavailable. Why?](/faq/backup-and-restore-faq.md#when-the-upstream-database-imports-data-using-tidb-lightning-in-the-physical-import-mode-the-log-backup-feature-becomes-unavailable-why).|
 | TiCDC | | BR v8.2.0 and later: if the target cluster to be restored has a changefeed and the changefeed [CheckpointTS](/ticdc/ticdc-architecture.md#checkpointts) is earlier than the BackupTS, BR does not perform the restoration. BR versions before v8.2.0: if the target cluster to be restored has any active TiCDC changefeeds, BR does not perform the restoration. |
-| Vector search | | Make sure that you are using v8.4.0 or a later version of BR to back up and restore data. Restoring tables with [vector data types](/vector-search-data-types.md) to TiDB clusters earlier than v8.4.0 is not supported. |
+| Vector search | | Make sure that you are using v8.4.0 or a later version of BR to back up and restore data. Restoring tables with [vector data types](/vector-search/vector-search-data-types.md) to TiDB clusters earlier than v8.4.0 is not supported. |
 
 ### Version compatibility
 

clinic/clinic-introduction.md

@@ -1,6 +1,6 @@
 ---
 title: PingCAP Clinic Overview
-summary: PingCAP Clinic is a diagnostic service for TiDB clusters deployed using TiUP or TiDB Operator. It helps troubleshoot cluster problems remotely, ensures stable operation, and provides quick cluster status checks. The service includes Diag client for data collection and Clinic Server for online diagnostic reports. Users can troubleshoot problems remotely and quickly check cluster status. Diag collects diagnostic data through various methods, and Clinic Server has limitations on clusters, storage, and data size. The service is free until July 14, 2024. Next steps include using PingCAP Clinic in different environments.
+summary: PingCAP Clinic is a diagnostic service for TiDB clusters deployed using TiUP or TiDB Operator. It helps troubleshoot cluster problems remotely, ensures stable operation, and provides quick cluster status checks. The service includes Diag client for data collection and Clinic Server for online diagnostic reports. Users can troubleshoot problems remotely and quickly check cluster status. Diag collects diagnostic data through various methods, and Clinic Server has limitations on clusters, storage, and data size. The service is free until April 15, 2025. Next steps include using PingCAP Clinic in different environments.
 ---
 
 # PingCAP Clinic Overview
@@ -61,7 +61,7 @@ First, Diag gets cluster topology information from the deployment tool TiUP (tiu
 
 > **Note:**
 >
-> - Clinic Server is free from July 15, 2022 to December 31, 2024. You will be notified through email before December 31, 2024 if the service starts charging fee afterwards.
+> - Clinic Server is free from July 15, 2022 to April 15, 2025. You will be notified through email before April 15, 2025 if the service starts charging fee afterwards.
 > - If you want to adjust the usage limitations, [get support](/support.md) from PingCAP.
 
 | Service Type| Limitation |

config-templates/simple-tiproxy.yaml

@@ -8,9 +8,12 @@ global:
 component_versions:
   tiproxy: "v1.2.0"
 server_configs:
+  tidb:
+    graceful-wait-before-shutdown: 15
   tiproxy:
     ha.virtual-ip: "10.0.1.10/24"
     ha.interface: "eth0"
+    graceful-wait-before-shutdown: 15
 
 pd_servers:
   - host: 10.0.1.1
@@ -29,7 +32,19 @@ tikv_servers:
 
 tiproxy_servers:
   - host: 10.0.1.11
+    deploy_dir: "/tiproxy-deploy"
+    data_dir: "/tiproxy-data"
+    port: 6000
+    status_port: 3080
+    config:
+      labels: { zone: "east" }
   - host: 10.0.1.12
+    deploy_dir: "/tiproxy-deploy"
+    data_dir: "/tiproxy-data"
+    port: 6000
+    status_port: 3080
+    config:
+      labels: { zone: "west" }
 
 monitoring_servers:
   - host: 10.0.1.13