Merge branch 'Oreoxmt:main' into preview-operator/pingcap/docs-tidb-o…

…perator/2406

docs.json

@@ -100,7 +100,7 @@
       "archived": ["v1.1", "v1.0"]
     },
     "tidbcloud": {
-      "target": "release-6.5",
+      "target": "release-7.1",
       "languages": {
         "en": {
           "repo": "pingcap/docs",

markdown-pages/en/tidb-in-kubernetes/master/TOC.md

@@ -127,6 +127,8 @@
   - v1.5
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/en/tidb-in-kubernetes/release-1.4/TOC.md

@@ -126,6 +126,8 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/en/tidb-in-kubernetes/release-1.5/TOC.md

@@ -127,6 +127,8 @@
   - v1.5
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/en/tidb/master/TOC.md

@@ -990,6 +990,7 @@
   - v7.2
     - [7.2.0-DMR](/releases/release-7.2.0.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

markdown-pages/en/tidb/release-7.1/TOC.md

@@ -982,6 +982,7 @@
   - [TiDB Versioning](/releases/versioning.md)
   - [TiDB Installation Packages](/binary-package.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

markdown-pages/en/tidb/release-7.2/TOC.md

@@ -990,6 +990,7 @@
   - v7.2
     - [7.2.0-DMR](/releases/release-7.2.0.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

markdown-pages/en/tidbcloud/master/TOC.md

@@ -52,7 +52,7 @@
       - [Prepared Statements](/develop/dev-guide-prepared-statement.md)
     - Read Data
       - [Query Data from a Single Table](/develop/dev-guide-get-data-from-single-table.md)
-      - [Multi-Table Join Queries](/develop/dev-guide-join-tables.md)
+      - [Multi-table Join Queries](/develop/dev-guide-join-tables.md)
       - [Subquery](/develop/dev-guide-use-subqueries.md)
       - [Paginate Results](/develop/dev-guide-paginate-results.md)
       - [Views](/develop/dev-guide-use-views.md)
@@ -62,7 +62,6 @@
         - [Follower Read](/develop/dev-guide-use-follower-read.md)
         - [Stale Read](/develop/dev-guide-use-stale-read.md)
       - [HTAP Queries](/develop/dev-guide-hybrid-oltp-and-olap-queries.md)
-      - [FastScan](/develop/dev-guide-use-fastscan.md)
     - Transaction
       - [Overview](/develop/dev-guide-transaction-overview.md)
       - [Optimistic and Pessimistic Transactions](/develop/dev-guide-optimistic-and-pessimistic-transaction.md)
@@ -99,7 +98,6 @@
       - [Overview](/tidb-cloud/branch-overview.md)
       - [Manage Branches](/tidb-cloud/branch-manage.md)
       - [GitHub Integration](/tidb-cloud/branch-github-integration.md)
-    - [Manage Spend Limit](/tidb-cloud/manage-serverless-spend-limit.md)
     - [Manage Spending Limit](/tidb-cloud/manage-serverless-spend-limit.md)
     - [Back Up and Restore TiDB Serverless Data](/tidb-cloud/backup-and-restore-serverless.md)
   - Manage TiDB Dedicated Clusters
@@ -119,8 +117,10 @@
     - [Create TiFlash Replicas](/tiflash/create-tiflash-replicas.md)
     - [Read Data from TiFlash](/tiflash/use-tidb-to-read-tiflash.md)
     - [Use MPP Mode](/tiflash/use-tiflash-mpp-mode.md)
+    - [Use FastScan](/tiflash/use-fastscan.md)
     - [Supported Push-down Calculations](/tiflash/tiflash-supported-pushdown-calculations.md)
     - [TiFlash Query Result Materialization](/tiflash/tiflash-results-materialization.md)
+    - [TiFlash Late Materialization](/tiflash/tiflash-late-materialization.md)
     - [Compatibility](/tiflash/tiflash-compatibility.md)
   - Monitor and Alert
     - [Overview](/tidb-cloud/monitor-tidb-cluster.md)
@@ -159,6 +159,7 @@
           - [Partition Pruning](/partition-pruning.md)
           - [TopN and Limit Push Down](/topn-limit-push-down.md)
           - [Join Reorder](/join-reorder.md)
+          - [Derive TopN or Limit from Window Functions](/derive-topn-from-window.md)
         - Physical Optimization
           - [Overview](/sql-physical-optimization.md)
           - [Index Selection](/choose-index.md)
@@ -167,12 +168,14 @@
           - [Wrong Index Solution](/wrong-index-solution.md)
           - [Distinct Optimization](/agg-distinct-optimization.md)
           - [Cost Model](/cost-model.md)
-        - [Prepare Execution Plan Cache](/sql-prepared-plan-cache.md)
+        - [Prepared Execution Plan Cache](/sql-prepared-plan-cache.md)
+        - [Non-Prepared Execution Plan Cache](/sql-non-prepared-plan-cache.md)
       - Control Execution Plans
         - [Overview](/control-execution-plan.md)
         - [Optimizer Hints](/optimizer-hints.md)
         - [SQL Plan Management](/sql-plan-management.md)
         - [The Blocklist of Optimization Rules and Expression Pushdown](/blocklist-control-plan.md)
+        - [Optimizer Fix Controls](/optimizer-fix-controls.md)
     - [TiKV Follower Read](/follower-read.md)
     - [Coprocessor Cache](/coprocessor-cache.md)
     - Garbage Collection (GC)
@@ -233,6 +236,8 @@
       - [Connect via Private Endpoint](/tidb-cloud/set-up-private-endpoint-connections.md)
       - [Connect via VPC Peering](/tidb-cloud/set-up-vpc-peering-connections.md)
       - [TLS Connections to TiDB Dedicated](/tidb-cloud/tidb-cloud-tls-connect-to-dedicated.md)
+  - Data Access Control
+      - [Encryption at Rest Using Customer-Managed Encryption Keys](/tidb-cloud/tidb-cloud-encrypt-cmek.md)
   - Database Access Control
     - [Configure Cluster Security Settings](/tidb-cloud/configure-security-settings.md)
   - Audit Management
@@ -303,9 +308,12 @@
       - [`ADMIN CANCEL DDL`](/sql-statements/sql-statement-admin-cancel-ddl.md)
       - [`ADMIN CHECKSUM TABLE`](/sql-statements/sql-statement-admin-checksum-table.md)
       - [`ADMIN CHECK [TABLE|INDEX]`](/sql-statements/sql-statement-admin-check-table-index.md)
+      - [`ADMIN CLEANUP INDEX`](/sql-statements/sql-statement-admin-cleanup.md)
+      - [`ADMIN RECOVER INDEX`](/sql-statements/sql-statement-admin-recover.md)
       - [`ADMIN SHOW DDL [JOBS|JOB QUERIES]`](/sql-statements/sql-statement-admin-show-ddl.md)
       - [`ALTER DATABASE`](/sql-statements/sql-statement-alter-database.md)
       - [`ALTER INDEX`](/sql-statements/sql-statement-alter-index.md)
+      - [`ALTER RESOURCE GROUP`](/sql-statements/sql-statement-alter-resource-group.md)
       - [`ALTER TABLE`](/sql-statements/sql-statement-alter-table.md)
       - [`ALTER TABLE COMPACT`](/sql-statements/sql-statement-alter-table-compact.md)
       - [`ALTER USER`](/sql-statements/sql-statement-alter-user.md)
@@ -319,6 +327,7 @@
       - [`CREATE [GLOBAL|SESSION] BINDING`](/sql-statements/sql-statement-create-binding.md)
       - [`CREATE DATABASE`](/sql-statements/sql-statement-create-database.md)
       - [`CREATE INDEX`](/sql-statements/sql-statement-create-index.md)
+      - [`CREATE RESOURCE GROUP`](/sql-statements/sql-statement-create-resource-group.md)
       - [`CREATE ROLE`](/sql-statements/sql-statement-create-role.md)
       - [`CREATE SEQUENCE`](/sql-statements/sql-statement-create-sequence.md)
       - [`CREATE TABLE LIKE`](/sql-statements/sql-statement-create-table-like.md)
@@ -334,6 +343,7 @@
       - [`DROP COLUMN`](/sql-statements/sql-statement-drop-column.md)
       - [`DROP DATABASE`](/sql-statements/sql-statement-drop-database.md)
       - [`DROP INDEX`](/sql-statements/sql-statement-drop-index.md)
+      - [`DROP RESOURCE GROUP`](/sql-statements/sql-statement-drop-resource-group.md)
       - [`DROP ROLE`](/sql-statements/sql-statement-drop-role.md)
       - [`DROP SEQUENCE`](/sql-statements/sql-statement-drop-sequence.md)
       - [`DROP STATS`](/sql-statements/sql-statement-drop-stats.md)
@@ -353,7 +363,9 @@
       - [`GRANT <role>`](/sql-statements/sql-statement-grant-role.md)
       - [`INSERT`](/sql-statements/sql-statement-insert.md)
       - [`KILL [TIDB]`](/sql-statements/sql-statement-kill.md)
+      - [`LOAD DATA`](/sql-statements/sql-statement-load-data.md)
       - [`LOCK STATS`](/sql-statements/sql-statement-lock-stats.md)
+      - [`LOCK TABLES` and `UNLOCK TABLES`](/sql-statements/sql-statement-lock-tables-and-unlock-tables.md)
       - [`MODIFY COLUMN`](/sql-statements/sql-statement-modify-column.md)
       - [`PREPARE`](/sql-statements/sql-statement-prepare.md)
       - [`RECOVER TABLE`](/sql-statements/sql-statement-recover-table.md)
@@ -369,6 +381,7 @@
       - [`SET DEFAULT ROLE`](/sql-statements/sql-statement-set-default-role.md)
       - [`SET [NAMES|CHARACTER SET]`](/sql-statements/sql-statement-set-names.md)
       - [`SET PASSWORD`](/sql-statements/sql-statement-set-password.md)
+      - [`SET RESOURCE GROUP`](/sql-statements/sql-statement-set-resource-group.md)
       - [`SET ROLE`](/sql-statements/sql-statement-set-role.md)
       - [`SET TRANSACTION`](/sql-statements/sql-statement-set-transaction.md)
       - [`SET [GLOBAL|SESSION] <variable>`](/sql-statements/sql-statement-set-variable.md)
@@ -379,6 +392,7 @@
       - [`SHOW COLLATION`](/sql-statements/sql-statement-show-collation.md)
       - [`SHOW [FULL] COLUMNS FROM`](/sql-statements/sql-statement-show-columns-from.md)
       - [`SHOW CREATE DATABASE`](/sql-statements/sql-statement-show-create-database.md)
+      - [`SHOW CREATE RESOURCE GROUP`](/sql-statements/sql-statement-show-create-resource-group.md)
       - [`SHOW CREATE SEQUENCE`](/sql-statements/sql-statement-show-create-sequence.md)
       - [`SHOW CREATE TABLE`](/sql-statements/sql-statement-show-create-table.md)
       - [`SHOW CREATE USER`](/sql-statements/sql-statement-show-create-user.md)
@@ -462,6 +476,7 @@
     - [Partitioning](/partitioned-table.md)
     - [Temporary Tables](/temporary-tables.md)
     - [Cached Tables](/cached-tables.md)
+    - [FOREIGN KEY Constraints](/foreign-key.md)
     - Character Set and Collation
       - [Overview](/character-set-and-collation.md)
       - [GBK](/character-set-gbk.md)
@@ -495,6 +510,7 @@
         - [`PARTITIONS`](/information-schema/information-schema-partitions.md)
         - [`PROCESSLIST`](/information-schema/information-schema-processlist.md)
         - [`REFERENTIAL_CONSTRAINTS`](/information-schema/information-schema-referential-constraints.md)
+        - [`RESOURCE_GROUPS`](/information-schema/information-schema-resource-groups.md)
         - [`SCHEMATA`](/information-schema/information-schema-schemata.md)
         - [`SEQUENCES`](/information-schema/information-schema-sequences.md)
         - [`SESSION_VARIABLES`](/information-schema/information-schema-session-variables.md)
@@ -508,6 +524,8 @@
         - [`TIDB_SERVERS_INFO`](/information-schema/information-schema-tidb-servers-info.md)
         - [`TIDB_TRX`](/information-schema/information-schema-tidb-trx.md)
         - [`TIFLASH_REPLICA`](/information-schema/information-schema-tiflash-replica.md)
+        - [`TIFLASH_SEGMENTS`](/information-schema/information-schema-tiflash-segments.md)
+        - [`TIFLASH_TABLES`](/information-schema/information-schema-tiflash-tables.md)
         - [`TIKV_REGION_PEERS`](/information-schema/information-schema-tikv-region-peers.md)
         - [`TIKV_REGION_STATUS`](/information-schema/information-schema-tikv-region-status.md)
         - [`TIKV_STORE_STATUS`](/information-schema/information-schema-tikv-store-status.md)
@@ -524,6 +542,7 @@
         - [RocksDB Overview](/storage-engine/rocksdb-overview.md)
     - TiFlash
       - [TiFlash Overview](/tiflash/tiflash-overview.md)
+      - [Spill to Disk](/tiflash/tiflash-spill-disk.md)
   - CLI
     - [Overview](/tidb-cloud/cli-reference.md)
     - cluster
@@ -559,6 +578,9 @@
       - [list](/tidb-cloud/ticloud-project-list.md)
     - [update](/tidb-cloud/ticloud-update.md)
   - [Table Filter](/table-filter.md)
+  - [Resource Control](/tidb-resource-control.md)
+  - [TiDB Backend Task Distributed Execution Framework](/tidb-distributed-execution-framework.md)
+  - [DDL Execution Principles and Best Practices](/ddl-introduction.md)
   - [Troubleshoot Inconsistency Between Data and Indexes](/troubleshoot-data-inconsistency-errors.md)
   - [Support](/tidb-cloud/tidb-cloud-support.md)
   - [Glossary](/tidb-cloud/tidb-cloud-glossary.md)

markdown-pages/en/tidbcloud/master/tidb-cloud/_index.md

@@ -101,14 +101,14 @@ hide_commit: true
 
 [Password Authentication](https://docs.pingcap.com/tidbcloud/tidb-cloud-password-authentication)
 
+[User Roles](https://docs.pingcap.com/tidbcloud/manage-user-access#user-roles)
+
 [Manage User Profiles](https://docs.pingcap.com/tidbcloud/manage-user-access#manage-user-profiles)
 
 [Manage organization access](https://docs.pingcap.com/tidbcloud/manage-user-access#manage-organization-access)
 
 [Manage project access](https://docs.pingcap.com/tidbcloud/manage-user-access#manage-project-access)
 
-[Configure Roles](https://docs.pingcap.com/tidbcloud/manage-user-access#manage-role-access)
-
 [Configure Security Settings](https://docs.pingcap.com/tidbcloud/configure-security-settings)
 
 </LearningPath>

markdown-pages/zh/tidb-in-kubernetes/master/TOC.md

@@ -127,6 +127,8 @@
   - v1.5
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/zh/tidb-in-kubernetes/release-1.4/TOC.md

@@ -126,6 +126,8 @@
   - [PingCAP Clinic 数据采集范围说明](clinic-data-collection.md)
 - 版本发布历史
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/zh/tidb-in-kubernetes/release-1.5/TOC.md

@@ -127,6 +127,8 @@
   - v1.5
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)
   - v1.4
+    - [1.4.7](releases/release-1.4.7.md)
+    - [1.4.6](releases/release-1.4.6.md)
     - [1.4.5](releases/release-1.4.5.md)
     - [1.4.4](releases/release-1.4.4.md)
     - [1.4.3](releases/release-1.4.3.md)

markdown-pages/zh/tidb/master/TOC.md

@@ -21,11 +21,21 @@
     - [使用 TiDB Serverless 构建 TiDB 集群](/develop/dev-guide-build-cluster-in-cloud.md)
     - [使用 TiDB 的增删改查 SQL](/develop/dev-guide-tidb-crud-sql.md)
   - 示例程序
-    - [Golang](/develop/dev-guide-sample-application-golang.md)
-    - [Java (Spring Boot)](/develop/dev-guide-sample-application-spring-boot.md)
-    - [Java](/develop/dev-guide-sample-application-java.md)
-    - [Python (Django)](/develop/dev-guide-sample-application-django.md)
-    - [Python](/develop/dev-guide-sample-application-python.md)
+    - Java
+      - [JDBC](/develop/dev-guide-sample-application-java-jdbc.md)
+      - [MyBatis](/develop/dev-guide-sample-application-java-mybatis.md)
+      - [Hibernate](/develop/dev-guide-sample-application-java-hibernate.md)
+      - [Spring Boot](/develop/dev-guide-sample-application-java-spring-boot.md)
+    - Go
+      - [Go-MySQL-Driver](/develop/dev-guide-sample-application-golang-sql-driver.md)
+      - [GORM](/develop/dev-guide-sample-application-golang-gorm.md)
+    - Python
+      - [mysqlclient](/develop/dev-guide-sample-application-python-mysqlclient.md)
+      - [MySQL Connector/Python](/develop/dev-guide-sample-application-python-mysql-connector.md)
+      - [PyMySQL](/develop/dev-guide-sample-application-python-pymysql.md)
+      - [SQLAlchemy](/develop/dev-guide-sample-application-python-sqlalchemy.md)
+      - [peewee](/develop/dev-guide-sample-application-python-peewee.md)
+      - [Django](/develop/dev-guide-sample-application-python-django.md)
   - 连接到 TiDB
     - [选择驱动或 ORM 框架](/develop/dev-guide-choose-driver-or-orm.md)
     - [连接到 TiDB](/develop/dev-guide-connect-to-tidb.md)
@@ -1003,6 +1013,7 @@
   - v7.2
     - [7.2.0-DMR](/releases/release-7.2.0.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

markdown-pages/zh/tidb/release-7.1/TOC.md

@@ -995,6 +995,7 @@
   - [TiDB 版本规则](/releases/versioning.md)
   - [TiDB 离线包](/binary-package.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

markdown-pages/zh/tidb/release-7.2/TOC.md

@@ -1003,6 +1003,7 @@
   - v7.2
     - [7.2.0-DMR](/releases/release-7.2.0.md)
   - v7.1
+    - [7.1.1](/releases/release-7.1.1.md)
     - [7.1.0](/releases/release-7.1.0.md)
   - v7.0
     - [7.0.0-DMR](/releases/release-7.0.0.md)

sync.sh

@@ -79,12 +79,12 @@ git -C "$REPO_DIR" checkout PR-"$PR_NUMBER"
 # Perform sync tasks
 for TASK in "${SYNC_TASKS[@]}"; do
 
-  SRC_DIR=$(echo "$TASK" | cut -d',' -f1)
+  SRC_DIR="$REPO_DIR/$(echo "$TASK" | cut -d',' -f1)"
   DEST_DIR="markdown-pages/$(echo "$TASK" | cut -d',' -f2)/$DIR_SUFFIX"
   mkdir -p "$DEST_DIR"
   # Only sync modified or added files
-  git -C "$REPO_DIR" diff --merge-base --name-only --diff-filter=AM origin/"$BASE_BRANCH" "$SRC_DIR" | tee /dev/fd/2 | \
-    rsync -av --files-from=- "$REPO_DIR" "$DEST_DIR"
+  git -C "$SRC_DIR" diff --merge-base --name-only --diff-filter=AMR origin/"$BASE_BRANCH" --relative | tee /dev/fd/2 | \
+    rsync -av --files-from=- "$SRC_DIR" "$DEST_DIR"
 
 done