Skip to content

Commit

Permalink
*: test renaming deploy/configure/secure/monitor files (#1322)
Browse files Browse the repository at this point in the history
* sql: update tidb slow log operation

* update log

* update log

* modify the translation: requirements vs recommendations

* improve the translation

* dm: add description for task overview monitor

* dm: add description for instances' monitor

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* dm: address comments

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* v2.1/tools, v2.1/tools: update TiDB-Binlog (#1245)

v2.1/tools: update TiDB-Binlog

* fix incorrect IP address parsing and other inline code formatting

* *: move overview and features (#1253)

Via: pingcap/docs#1045

* TOC: update the quickstart link (#1255)

* sql: remove redundant content in privilege && user, tiny clean up

* Apply suggestions from code review

Co-Authored-By: dcalvin <[email protected]>

* Apply suggestions from code review

Co-Authored-By: dcalvin <[email protected]>

* Update tools/dm/monitor.md

Co-Authored-By: csuzhangxc <[email protected]>

* dm: address comments

* add digest declare

* update eg

* add stats eg

* update eg

* address comment and add more field

* TOC: covert docs-cn to DITA TOC (#1242)

* TOC: covert docs-cn to DITA TOC

* TOC: update wording

* TOC: refine wording

* toc: update description and a link

* toc: update wording

* toc: update a file name

* toc: remove the K8s link

* toc: fix a link about incremental replication

* toc: update a blog post link to Chinese version

* toc: fix a link and update wording

* toc: update key features and overview

* toc: update About TiDB

* add declare for v2.1.8

* address comment

* change the link of back-restore in tidb-binlog document

* address comment

* *: remove doc redundant space

* sql/slow_query: add pt-digest-query version

* tools: update a lightning download link

* address comment

* sql, TOC: update doc title (#1262)

* benchmark: update the Note format

* op-guide: update the Note format

* benchmark, op-guide: Update the Note format (#1273)

benchmark, op-guide: update the Note format

* *: update the Note format

* address comment

* *: update the Note format

* benchmark, v2.1/benchmark: remove an invalid link (#1275)

* benchmark: remove an invalid link

* v2.1/benchmark: remove an invalid link

* update condition (#1265)

* Update sql/slow-query.md

Co-Authored-By: crazycs520 <[email protected]>

* Update sql/slow-query.md

Co-Authored-By: crazycs520 <[email protected]>

* sql: update the USE command explanation in util document (#1269)

* docs-cn #1112 Update the USE command explanation in util document

* Update sql/util.md

LGTM

Co-Authored-By: ericsyh <[email protected]>

* Update v1.0/sql/util.md

LGTM

Co-Authored-By: ericsyh <[email protected]>

* Update v2.0/sql/util.md

LGTM

Co-Authored-By: ericsyh <[email protected]>

* Update v2.1/sql/util.md

LGTM

Co-Authored-By: ericsyh <[email protected]>

* update the loader pprof-addr default port (#1256)

* tools: clarify meaning of "N/A" (#1267)

* releases: correct the TiDB-Ansible version (#1280)

* sql: fix some format mistakes (#1277)

* Sql: fix some format mistakes

* Update sql/slow-query.md

Co-Authored-By: IzabelWang <[email protected]>

* Update sql/slow-query.md

Co-Authored-By: IzabelWang <[email protected]>

* Update sql/slow-query.md

Co-Authored-By: IzabelWang <[email protected]>

* Update op-guide/tidb-config-file.md

Co-Authored-By: IzabelWang <[email protected]>

* Update sql/slow-query.md

Co-Authored-By: IzabelWang <[email protected]>

* Remove unnecessary space

* Update slow-query.md

* Update slow-query.md

* sql: update generated columns docs

* address comment and add issue link

* *: rename how-to get started (#1281)

* *: rename how-to get started

Related PR: pingcap/docs#1046

* *: fix aliases link path

* sql: update content structure and wording (#1259)

* TOC: update a doc title (#1285)

* tools/lightning: fix a broken link (#1287)

* explain for update statement (#1284)

* tools, toc: reorganize TiDB Binlog documents (#1264)

* reorg the binlog documents

* update TOC format

* change the pd to file in overview

* update the ansible-deployment link

* rename the previous version of tidb-binlog to tidb-binlog-local

* Make the explaination of pausing and paused more clear

* change the order in TOC

* uncomment some necessary configs in kafka version

* add more explaination of paused and offline in overview

* fix the typo

* Add the Topic config in Kafka driver

* update the gc intro in deployment

* remove unnecessary step in deployment

* remove the compression in deploy document

* remove sql in the file dainer

* update the download link in deployment

* Time and size limits delete

* abandon enable-tolerant config

* move the reparo document into binlog folder

* update the rapero download link

* update drainer_pd to drainer_file

* trouble-shooting: update the issue report link (#1289)

* trouble-shooting: update the issue report link

* Update trouble-shooting.md

Co-Authored-By: CaitinChen <[email protected]>

* Update trouble-shooting.md

Co-Authored-By: CaitinChen <[email protected]>

* Update trouble-shooting.md

Co-Authored-By: CaitinChen <[email protected]>

* tools/binlog: optimize the TiDB-Binlog documents (#1291)

* fix some problems with suggestions from Lilian and Calvin

* tools/binlog: fix and update format (#1292)

* tools/binlog: fix and update format

* tools/binlog: update wording

* tools/binlog: update a link

* Update tools/binlog/upgrade.md

Co-Authored-By: lilin90 <[email protected]>

* tools: update syncer batch size (#1288)

* tools/dm: fix the error in valus from ansible command (#1293)

* sql: fix punctuation and format

* circle.yml: [WIP] comment publish pdf cmd

* TOC, releases: add 2.1.9 release notes (#1298)

* TOC, releases: add 2.1.9 release notes

PTAL

* Update 2.1.9.md

* releases: fix format

* tools: update loader status addr (#1299)

* Add charset check in Syncer precheck (#1300)

* Add charset check in Syncer precheck

* Update tools/syncer.md

Co-Authored-By: ericsyh <[email protected]>

* circle.yml: remove IP address (#1301)

* *: change "登陆" to “登录” (#1302)

* sql: fix format (#1303)

* sql: update a comma (#1305)

* sql: replace "jeffrey" with "test" (#1309)

* op-guide/monitor: update the PD API DOC link (#1311)

* Update the link

* Update the PD API DOC link

* tools: fix the format error in Syncer (#1306)

* Fix the format error in Syncer

* Update tools/syncer.md

Co-Authored-By: ericsyh <[email protected]>

* update a link (#1313)

* op-guide: add a guide about upgrading to 3.0 (#1258)

* Add rolling update TiDB 3.0 guide.

* Add rolling update TiDB 3.0 guide.

* Apply suggestions from code review

Co-Authored-By: superlzs0476 <[email protected]>

* Apply suggestions from code review

* Apply suggestions from code review

Co-Authored-By: liubo <[email protected]>

* op-guide: update a note format

* op-guide: update wording

* op-guide: update format

* circle.yml: add a new IP for qiniu (#1315)

* sql: fix typo (#1286)

* media, tools: update TiDB-Lightning architecture

Via: pingcap/docs#1128

* Delete useless instruction (#1308)

* TOC, releases: add TiDB 3.0.0 RC1 release notes (#1316)

* TOC, releases: add TiDB 3.0.0 RC1 release notes

PTAL

* Fix format

* add new updates

* Update TOC.md

* Update rn.md

* op-guide, toc: fix upgrade wording and update TOC (#1318)

* op-guide, tools: fix a link and remove duplicated file (#1319)

* *: update version limit for DM/Syncer (#1312)

* toc, support: reorganize TOC and update a link (#1320)

* toc, support: reorganize TOC and update a link

Related PR: #1279

* toc: udpate description

* toc: update wording

* *: rename how-to deploy/configure/secure/monitor
  • Loading branch information
lilin90 authored May 13, 2019
1 parent f00d774 commit 863c552
Show file tree
Hide file tree
Showing 162 changed files with 2,076 additions and 1,333 deletions.
10 changes: 5 additions & 5 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ TiDB 的 sql_mode 与 MySQL 的 sql_mode 设置方法有一些差别,TiDB 不

#### 1.1.24 TiDB 支持哪些认证协议,过程是怎样的?

这一层跟 MySQL 一样,走的 SASL 认证协议,用于用户登陆认证,对密码的处理流程。
这一层跟 MySQL 一样,走的 SASL 认证协议,用于用户登录认证,对密码的处理流程。

客户端连接 TiDB 的时候,走的是 challenge-response(挑战-应答)的认证模式,过程如下:

Expand Down Expand Up @@ -349,9 +349,9 @@ Binary 不是我们建议的安装方式,对升级支持也不友好,建议
| 滚动升级除 PD 外模块 | ansible-playbook rolling\_update.yml --skip-tags=pd |
| 滚动升级监控组件 | ansible-playbook rolling\_update\_monitor.yml |

#### 3.1.2 TiDB 如何登陆
#### 3.1.2 TiDB 如何登录

和 MySQL 登陆方式一样,可以按照下面例子进行登陆
和 MySQL 登录方式一样,可以按照下面例子进行登录

`mysql -h 127.0.0.1 -uroot -P4000`

Expand Down Expand Up @@ -697,9 +697,9 @@ loader 的 -t 参数可以根据 TiKV 的实例个数以及负载进行评估调
TiDB 支持绝大多数 MySQL 语法,一般不需要修改代码。
#### 4.1.4 不小心把 MySQL 的 user 表导入到 TiDB 了,或者忘记密码,无法登陆,如何处理?
#### 4.1.4 不小心把 MySQL 的 user 表导入到 TiDB 了,或者忘记密码,无法登录,如何处理?
重启 TiDB 服务,配置文件中增加 `-skip-grant-table=true` 参数,无密码登陆集群后,可以根据情况重建用户,或者重建 mysql.user 表,具体表结构搜索官网。
重启 TiDB 服务,配置文件中增加 `-skip-grant-table=true` 参数,无密码登录集群后,可以根据情况重建用户,或者重建 mysql.user 表,具体表结构搜索官网。
#### 4.1.5 在 Loader 运行的过程中,TiDB 可以对外提供服务吗?
该操作进行逻辑插入,TiDB 仍可对外提供服务,但不要执行相关 DDL 操作。
Expand Down
215 changes: 97 additions & 118 deletions TOC.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TiDB 中文技术文档
# TiDB 中文用户文档

## 目录

Expand All @@ -11,36 +11,31 @@
+ 操作指南
+ 快速上手
+ 创建本地集群
- [使用 Docker Compose](op-guide/docker-compose.md)
- [SQL 基本操作](try-tidb.md)
- [读取历史数据](op-guide/history-read.md)
- 部署
- [软硬件环境需求](op-guide/recommendation.md)
- [使用 Docker Compose](dev/how-to/get-started/local-cluster/install-from-docker-compose.md)
- [SQL 基本操作](dev/how-to/get-started/explore-sql.md)
- [读取历史数据](dev/how-to/get-started/read-historical-data.md)
+ 部署
- [软硬件环境需求](dev/how-to/deploy/hardware-recommendations.md)
+ 集群部署方式
- [使用 Ansible 部署(推荐)](op-guide/ansible-deployment.md)
- [使用 Ansible 离线部署](op-guide/offline-ansible-deployment.md)
- [使用 Docker 部署](op-guide/docker-deployment.md)
- [使用 Ansible 部署(推荐)](dev/how-to/deploy/orchestrated/ansible.md)
- [使用 Ansible 离线部署](dev/how-to/deploy/orchestrated/offline-ansible.md)
- [使用 Docker 部署](dev/how-to/deploy/orchestrated/docker.md)
+ 跨地域冗余
- [跨数据中心部署方案](op-guide/cross-dc-deployment.md)
- [配置集群拓扑](op-guide/location-awareness.md)
- [TiSpark 快速上手](tispark/tispark-quick-start-guide.md)
- [使用 Ansible 部署 DM 集群](tools/dm/deployment.md)
- [跨数据中心部署方案](dev/how-to/deploy/geographic-redundancy/overview.md)
- [配置集群拓扑](dev/how-to/deploy/geographic-redundancy/location-awareness.md)
- [TiSpark 快速上手](dev/how-to/deploy/tispark.md)
- [使用 Ansible 部署 DM 集群](dev/how-to/deploy/data-migration-with-ansible.md)
+ 配置
- [时区](dev/how-to/configure/time-zone.md)
- [内存控制](dev/how-to/configure/memory-control.md)
+ 安全
- [与 MySQL 的安全特性差异](sql/security-compatibility.md)
- [TiDB 数据库权限管理](sql/privilege.md)
- [TiDB 用户账户管理](sql/user-account-management.md)
+ 安全传输层协议 (TLS)
- [为 MySQL 客户端启用 TLS](sql/encrypted-connections.md)
- [为 TiDB 组件启用 TLS](op-guide/security.md)
- [生成自签名证书](op-guide/generate-self-signed-certificates.md)
- [为 MySQL 客户端开启 TLS](dev/how-to/secure/enable-tls-clients.md)
- [为 TiDB 组件间开启 TLS](dev/how-to/secure/enable-tls-between-components.md)
- [生成自签名证书](dev/how-to/secure/generate-self-signed-certificates.md)
+ 监控
- [概述](op-guide/monitor-overview.md)
- [监控 TiDB 集群](op-guide/monitor.md)
+ 重要监控指标详解
- [Overview](op-guide/dashboard-overview-info.md)
- [TiDB](op-guide/tidb-dashboard-info.md)
- [PD](op-guide/dashboard-pd-info.md)
- [TiKV](op-guide/dashboard-tikv-info.md)
- [概述](dev/how-to/monitor/overview.md)
- [监控 TiDB 集群](dev/how-to/monitor/monitor-a-cluster.md)
+ 迁移
- [概述](op-guide/migration-overview.md)
+ 从 MySQL 迁移
Expand All @@ -52,36 +47,30 @@
+ 备份与恢复
- [全量备份](op-guide/backup-restore.md)
- [增量备份](tools/tidb-binlog-cluster.md)
+ 扩容缩容
- [集群扩容缩容方案](op-guide/horizontal-scale.md)
- [使用 Ansible 扩容缩容](op-guide/ansible-deployment-scale.md)
- [定位慢查询](sql/slow-query.md)
+ 升级
- [升级至 TiDB 2.1](op-guide/tidb-v2.1-upgrade-guide.md)
- [升级 Data Migration](tools/dm/dm-upgrade.md)
- [使用 Ansible 滚动升级](op-guide/ansible-deployment-rolling-update.md)
- 故障诊断
- [错误码](sql/error.md)
+ 扩容缩容
- [使用 Ansible 扩容缩容](op-guide/ansible-deployment-scale.md)
- [集群扩容缩容方案](op-guide/horizontal-scale.md)
+ 升级
- [升级至 TiDB 3.0](op-guide/tidb-v3.0-upgrade-guide.md)
- [升级至 TiDB 2.1](op-guide/tidb-v2.1-upgrade-guide.md)
- [使用 Ansible 滚动升级](op-guide/ansible-deployment-rolling-update.md)
- [升级 Data Migration](tools/dm/dm-upgrade.md)
+ 故障诊断
- [集群配置诊断](trouble-shooting.md)
- [Data Migration 故障诊断](tools/dm/troubleshooting.md)
- [TiDB-Lightning 故障诊断](tools/lightning/errors.md)
- [支持渠道](support.md)
- [反馈问题](report-issue.md)
+ [贡献](contribute.md)
- [贡献代码](contribute.md#成为-tidb-的贡献者)
- [改进文档](contribute.md#改进文档)
+ 参考资源
+ 参考手册
+ [与 MySQL 兼容性对比](sql/mysql-compatibility.md)
+ SQL
- [支持的连接器和 API](sql/connection-and-APIs.md)
- [与 MySQL 兼容性对比](sql/mysql-compatibility.md)
+ SQL 语句
- [数据定义语句 (DDL)](sql/ddl.md)
- [数据操作语句 (DML)](sql/dml.md)
- [事务语句](sql/transaction.md)
- [数据库管理语句](sql/admin.md)
- [Prepared SQL 语句语法](sql/prepare.md)
- [实用工具语句](sql/util.md)
- [TiDB SQL 语法图](https://pingcap.github.io/sqlgram/)
- [TiDB SQL 语法图](https://pingcap.github.io/sqlgram/)
+ SQL 语言结构
- [字面值](sql/literal-values.md)
- [Schema 对象名](sql/schema-object-names.md)
- [关键字和保留字](sql/keywords-and-reserved-words.md)
- [用户自定义变量](sql/user-defined-variables.md)
- [表达式语法](sql/expression-syntax.md)
- [注释语法](sql/comment-syntax.md)
+ 数据类型
- [数值类型](sql/datatype.md#数值类型)
- [日期和时间类型](sql/datatype.md#日期时间类型)
Expand All @@ -90,7 +79,6 @@
- [枚举类型](sql/datatype.md#枚举类型)
- [集合类型](sql/datatype.md#集合类型)
- [数据类型默认值](sql/datatype.md#数据类型的默认值)
- [约束](sql/constraints.md)
+ 函数与操作符
- [函数与操作符概述](sql/functions-and-operators-reference.md)
- [表达式求值的类型转换](sql/type-conversion-in-expression-evaluation.md)
Expand All @@ -107,48 +95,60 @@
- [GROUP BY 聚合函数](sql/aggregate-group-by-functions.md)
- [其它函数](sql/miscellaneous-functions.md)
- [精度数学](sql/precision-math.md)
+ SQL 语言结构
- [字面值](sql/literal-values.md)
- [Schema 对象名](sql/schema-object-names.md)
- [关键字和保留字](sql/keywords-and-reserved-words.md)
- [用户自定义变量](sql/user-defined-variables.md)
- [表达式语法](sql/expression-syntax.md)
- [注释语法](sql/comment-syntax.md)
+ SQL 语句
- [数据定义语句 (DDL)](sql/ddl.md)
- [数据操作语句 (DML)](sql/dml.md)
- [事务语句](sql/transaction.md)
- [数据库管理语句](sql/admin.md)
- [Prepared SQL 语句语法](sql/prepare.md)
- [实用工具语句](sql/util.md)
- [约束](sql/constraints.md)
- [生成列](sql/generated-columns.md)
+ 事务
- [事务模型](sql/transaction-model.md)
- [隔离级别](sql/transaction-isolation.md)
+ 性能
- [SQL 优化流程](sql/sql-optimizer-overview.md)
- [基于代价的优化](sql/understanding-the-query-execution-plan.md)
- [统计信息概述](sql/statistics.md)
- [Optimizer Hints](sql/optimizer-hints.md)
- [TiKV 调优](op-guide/tune-tikv.md)
- [TiDB 最佳实践](https://pingcap.com/blog-cn/tidb-best-practice/)
- [TiDB 系统数据库](sql/system-database.md)
- [Information Schema](sql/information-schema.md)
- [TiSpark 使用指南](tispark/tispark-user-guide.md)
- [字符集](sql/character-set-support.md)
+ 配置
+ tidb-server
- [MySQL 系统变量](sql/variable.md)
- [TiDB 特定系统变量](sql/tidb-specific.md)
- [时区](sql/time-zone.md)
- [字符集](sql/character-set-support.md)
- [内存控制](sql/tidb-memory-control.md)
- [垃圾回收 (GC)](op-guide/gc.md)
- [配置参数](op-guide/configuration.md)
+ pd-server
- [配置参数](op-guide/pd-configuration.md)
+ tikv-server
- [配置参数](op-guide/tikv-configuration.md)
+ 监控指标
- [Overview 面板](op-guide/dashboard-overview-info.md)
- [TiDB 面板](op-guide/tidb-dashboard-info.md)
- [PD 面板](op-guide/dashboard-pd-info.md)
- [TiKV 面板](op-guide/dashboard-tikv-info.md)
+ 安全
- [与 MySQL 的安全特性差异](sql/security-compatibility.md)
- [TiDB 数据库权限管理](sql/privilege.md)
- [TiDB 用户账户管理](sql/user-account-management.md)
+ 事务
- [事务模型](sql/transaction-model.md)
- [隔离级别](sql/transaction-isolation.md)
+ 系统数据库
- [`mysql`](sql/system-database.md)
- [`information_schema`](sql/information-schema.md)
- [错误码](sql/error.md)
- [支持的连接器和 API](sql/connection-and-APIs.md)
- [垃圾回收 (GC)](op-guide/gc.md)
+ 性能调优
- [SQL 优化流程](sql/sql-optimizer-overview.md)
- [理解 TiDB 执行计划](sql/understanding-the-query-execution-plan.md)
- [统计信息概述](sql/statistics.md)
- [Optimizer Hints](sql/optimizer-hints.md)
- [TiKV 调优](op-guide/tune-tikv.md)
- [TiDB 最佳实践](https://pingcap.com/blog-cn/tidb-best-practice/)
+ [TiSpark 使用指南](tispark/tispark-user-guide.md)
+ 生态工具
- [Mydumper](tools/mydumper.md)
- [Loader](tools/loader.md)
- [Syncer](tools/syncer.md)
+ Data Migration
- [概述](tools/dm/overview.md)
- [使用限制](tools/dm/overview.md#使用限制)
+ [部署使用](tools/dm/practice.md)
+ [概述](tools/dm/overview.md)
- [DM 架构](tools/dm/overview.md#dm-架构)
- [同步功能介绍](tools/dm/overview.md#同步功能介绍)
- [使用限制](tools/dm/overview.md#使用限制)
+ 核心特性
- [Table Routing](tools/dm/data-synchronization-features.md#table-routing)
- [Black & White Lists](tools/dm/data-synchronization-features.md#black-white-table-lists)
Expand All @@ -162,6 +162,7 @@
+ 使用场景
- [简单的从库同步场景](tools/dm/simple-synchronization-scenario.md)
- [分库分表合并场景](tools/dm/shard-merge-scenario.md)
+ [部署使用](tools/dm/practice.md)
+ 配置
- [概述](tools/dm/dm-configuration-file-overview.md)
- [任务配置](tools/dm/task-configuration-file-intro.md)
Expand All @@ -175,57 +176,35 @@
- [表库过滤](tools/lightning/filter.md)
- [CSV 支持](tools/lightning/csv.md)
- [监控告警](tools/lightning/monitor.md)
- [TiDB-Binlog](tools/tidb-binlog-cluster.md)
+ TiDB-Binlog
- [概述](tools/binlog/overview.md)
- [部署使用](tools/binlog/deploy.md)
- [监控告警](tools/binlog/monitor.md)
- [运维管理](tools/binlog/operation.md)
- [版本升级](tools/binlog/upgrade.md)
- [PD Control](tools/pd-control.md)
- [PD Recover](tools/pd-recover.md)
- [TiKV Control](https://github.com/tikv/tikv/blob/master/docs/tools/tikv-control.md)
- [TiDB Controller](tools/tidb-controller.md)
- [工具下载](tools/download.md)
- [TiDB 路线图](ROADMAP.md)
+ 用户案例
- [北京银行](http://t.cn/RnY8fGn)
- [海航](http://t.cn/REXx0Qe)
- [美团点评](http://t.cn/EAFCqhl)
- [今日头条](http://t.cn/RnLfEMf)
- [转转](http://t.cn/R1MAXEq)
- [Mobike](http://t.cn/RT8FbP6)
- [小米科技](http://t.cn/Ey2xCDK)
- [爱奇艺](http://t.cn/EvErsc1)
- [易果生鲜](http://t.cn/RTYVhzH)
- [同程旅游(一)](http://t.cn/RmXeNKR)
- [同程旅游(二)](http://t.cn/EAmsF08)
- [去哪儿](http://t.cn/RTKnsL7)
- [火星文化](http://t.cn/EAuvfcs)
- [G7](http://t.cn/RQVePoX)
- [一面数据](http://t.cn/RT9r5di)
- [凤凰网](http://t.cn/RHRQfNT)
- [猿辅导](http://t.cn/RTKnKSX)
- [Mobikok](http://t.cn/Rm1F6lg)
- [二维火](http://t.cn/R8bXM2f)
- [客如云](http://t.cn/R1wSEJH)
- [Ping++](http://t.cn/RE5xYKn)
- [乐视云](http://t.cn/Rnv3IVs)
- [零氪科技](http://t.cn/REj7tSv)
- [威锐达测控](http://t.cn/R3CrviR)
- [盖娅互娱](http://t.cn/RT9r7hx)
- [游族网络](http://t.cn/R8k4AWB)
- [西山居](http://t.cn/RBP12zj)
- [FUNYOURS JAPAN](http://t.cn/Rnoab5D)
- [丰巢科技](http://t.cn/EAuvLIv)
- [特来电](http://t.cn/RrHzUGW)
- [万达网络](http://t.cn/RTKm6ds)
- [360金融](http://t.cn/RTKnTev)
- [中国电信翼支付](http://t.cn/R3Wd9p3)
- [某电信运营商](http://t.cn/RTYWADg)
+ 常见问题 (FAQ)
- [TiDB FAQ](FAQ.md)
- [TiDB-Lightning FAQ](tools/lightning/faq.md)
- [升级 FAQ](op-guide/upgrade-faq.md)
+ 技术支持
- [支持渠道](support.md)
- [反馈问题](report-issue.md)
+ [贡献](contribute.md)
- [贡献代码](contribute.md#成为-tidb-的贡献者)
- [改进文档](contribute.md#改进文档)
- [TiDB 路线图](ROADMAP.md)
+ [版本发布历史](releases/rn.md)
+ v3.0
- [3.0.0 Beta.1](releases/3.0.0-beta.1.md)
- [3.0 Beta](releases/3.0beta.md)
- [3.0.0-rc.1](releases/3.0.0-rc.1.md)
- [3.0.0-beta.1](releases/3.0.0-beta.1.md)
- [3.0.0-beta](releases/3.0beta.md)
+ v2.1
- [2.1.9](releases/2.1.9.md)
- [2.1.8](releases/2.1.8.md)
- [2.1.7](releases/2.1.7.md)
- [2.1.6](releases/2.1.6.md)
Expand Down
5 changes: 1 addition & 4 deletions benchmark/sysbench-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ IDC 机器
| OS | Linux (CentOS 7.3.1611) |
| CPU | 40 vCPUs, Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz |
| RAM | 128GB |
| DISK | Optane 500GB SSD * 1 |

Sysbench 测试脚本:
https://github.com/pingcap/tidb-bench/tree/master/sysbench
| DISK | Optane 500GB SSD * 1 |

## 测试方案

Expand Down
10 changes: 7 additions & 3 deletions benchmark/sysbench-v4.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ block-cache-size = "6GB"

## 测试过程

> **注意**:此次测试并没有使用如 HAproxy 等负载均衡工具。在 TiDB 单一节点上进行 Sysbench 测试,并把结果相加。负载均衡工具和不同版本参数也会影响性能表现。
> **注意:**
>
> 此次测试并没有使用如 HAproxy 等负载均衡工具。在 TiDB 单一节点上进行 Sysbench 测试,并把结果相加。负载均衡工具和不同版本参数也会影响性能表现。
### Sysbench 配置

Expand Down Expand Up @@ -134,10 +136,12 @@ create database sbtest;

假设用户使用的 [Sysbench](https://github.com/akopytov/sysbench/tree/1.0.14) 版本。我们可以通过以下两种方式来修改。

1. 直接下载为 TiDB 修改好的 [oltp_common.lua](https://raw.githubusercontent.com/pingcap/tidb-bench/master/sysbench-patch/oltp_common.lua) 文件,覆盖 `/usr/share/sysbench/oltp_common.lua` 文件。
1. 直接下载为 TiDB 修改好的 [oltp_common.lua](https://raw.githubusercontent.com/pingcap/tidb-bench/master/sysbench/sysbench-patch/oltp_common.lua) 文件,覆盖 `/usr/share/sysbench/oltp_common.lua` 文件。
2.`/usr/share/sysbench/oltp_common.lua` 的第 [235](https://github.com/akopytov/sysbench/blob/1.0.14/src/lua/oltp_common.lua#L235) 行到第 [240](https://github.com/akopytov/sysbench/blob/1.0.14/src/lua/oltp_common.lua#L240) 行移动到第 198 行以后。

> **注意**:此操作为可选操作,仅节约了数据导入时间。
> **注意:**
>
> 此操作为可选操作,仅节约了数据导入时间。
命令行输入以下命令,开始导入数据,config 文件为上一步中配置的文件:

Expand Down
4 changes: 3 additions & 1 deletion benchmark/sysbench.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ draft: true

测试 TiDB 在 OLTP 场景下的性能以及水平扩展能力。

> **注意**: 不同的测试环境可能使测试结果发生改变。
> **注意:**
>
> 不同的测试环境可能使测试结果发生改变。
## 测试版本、时间、地点

Expand Down
4 changes: 3 additions & 1 deletion benchmark/tpch-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ category: benchmark

测试 TiDB 在 OLAP 场景下 2.0 和 2.1 版本的性能对比。

> **注意**:不同的测试环境可能使测试结果发生改变。
> **注意:**
>
> 不同的测试环境可能使测试结果发生改变。
## 测试环境

Expand Down
Loading

0 comments on commit 863c552

Please sign in to comment.