You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/03/02 14:13:55 UTC
[incubator-doris] branch master updated: [Doc] Fix some typo (#3024)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 70cc6df [Doc] Fix some typo (#3024)
70cc6df is described below
commit 70cc6df41533388f8464b2f7cf26bee335614206
Author: yangzhg <78...@qq.com>
AuthorDate: Mon Mar 2 22:13:47 2020 +0800
[Doc] Fix some typo (#3024)
---
.../en/administrator-guide/backup-restore_EN.md | 2 +-
docs/documentation/en/administrator-guide/broker_EN.md | 2 +-
.../administrator-guide/http-actions/get-label-state_EN.md | 1 -
.../administrator-guide/load-data/broker-load-manual_EN.md | 14 +++++++-------
.../en/administrator-guide/load-data/load-manual_EN.md | 2 +-
.../administrator-guide/operation/metadata-operation_EN.md | 4 ++--
.../en/administrator-guide/small-file-mgr_EN.md | 2 +-
docs/documentation/en/community/how-to-contribute_EN.md | 4 ++--
docs/documentation/en/community/release-process_EN.md | 6 +++---
docs/documentation/en/installing/install-deploy_EN.md | 8 ++++----
10 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/docs/documentation/en/administrator-guide/backup-restore_EN.md b/docs/documentation/en/administrator-guide/backup-restore_EN.md
index e740f5a..1a56399 100644
--- a/docs/documentation/en/administrator-guide/backup-restore_EN.md
+++ b/docs/documentation/en/administrator-guide/backup-restore_EN.md
@@ -39,7 +39,7 @@ The backup operation is to upload the data of the specified table or partition d
After the data file snapshot is uploaded, Frontend first writes the corresponding metadata to the local file, and then uploads the local metadata file to the remote warehouse through broker. Finish the final backup job.
-###Restore
+### Restore
Recovery operations need to specify a backup that already exists in a remote repository, and then restore the backup content to the local cluster. When a user submits a Restore request, the following actions will be done within the system:
diff --git a/docs/documentation/en/administrator-guide/broker_EN.md b/docs/documentation/en/administrator-guide/broker_EN.md
index 9756383..4854f0e 100644
--- a/docs/documentation/en/administrator-guide/broker_EN.md
+++ b/docs/documentation/en/administrator-guide/broker_EN.md
@@ -174,7 +174,7 @@ Authentication information is usually provided as a Key-Value in the Property Ma
* `hadoop.security.authentication`: Specify the authentication method as kerberos.
* `kerberos_principal`： Specify the principal of kerberos.
- * `kerberos_keytab`: Specify the path to the keytab file for kerberos. The file must be an absolute path to a file on the server where the broker process is located. And can be accessed by the Broker process.径。
+ * `kerberos_keytab`: Specify the path to the keytab file for kerberos. The file must be an absolute path to a file on the server where the broker process is located. And can be accessed by the Broker process.
* `kerberos_keytab_content`: Specify the content of the keytab file in kerberos after base64 encoding. You can choose one of these with `kerberos_keytab` configuration.
Examples are as follows：
diff --git a/docs/documentation/en/administrator-guide/http-actions/get-label-state_EN.md b/docs/documentation/en/administrator-guide/http-actions/get-label-state_EN.md
index bceb37a..49bb6ed 100644
--- a/docs/documentation/en/administrator-guide/http-actions/get-label-state_EN.md
+++ b/docs/documentation/en/administrator-guide/http-actions/get-label-state_EN.md
@@ -32,7 +32,6 @@ under the License.
RETURN VALUES
Return of JSON format string of the status of specified transaction:
- 执行完毕后，会以Json格式返回这次导入的相关内容。当前包括一下字段
Label: The specified label.
Status: Success or not of this request.
Message: Error messages
diff --git a/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md b/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
index 8c52029..d45311e 100644
--- a/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
+++ b/docs/documentation/en/administrator-guide/load-data/broker-load-manual_EN.md
@@ -78,7 +78,7 @@ BE pulls data from Broker and imports it into the system after transforming the
### Create a load
-Broker load 创建导入语句
+Broker load create a data load job
Grammar:
@@ -211,7 +211,7 @@ The following is a detailed explanation of some parameters of the import operati
+ strict\_mode
- Broker load 导入可以开启 strict mode 模式。开启方式为 ```properties ("strict_mode" = "true")``` 。默认的 strict mode 为关闭。
+ Broker load can use `strict mode`. Use ```properties ("strict_mode" = "true")``` to enable `strict mode`, default is false
The strict mode means that the column type conversion in the import process is strictly filtered. The strategy of strict filtering is as follows:
@@ -229,7 +229,7 @@ Here's an example of a column type TinyInt
|source data | source data example | string to int | strict_mode | result|
|------------|---------------------|-----------------|--------------------|---------|
-|空值 | \N | N/A | true or false | NULL|
+|null | \N | N/A | true or false | NULL|
|not null | aaa or 2000 | NULL | true | invalid data(filtered)|
|not null | aaa | NULL | false | NULL|
|not null | 1 | 1 | true or false | correct data|
@@ -240,7 +240,7 @@ Here's an example of column type Decimal (1,0)
|source data | source data example | string to int | strict_mode | result|
|------------|---------------------|-----------------|--------------------|--------|
-|空值 | \N | N/A | true or false | NULL|
+|null | \N | N/A | true or false | NULL|
|not null | aaa | NULL | true | invalid data(filtered)|
|not null | aaa | NULL | false | NULL|
|not null | 1 or 10 | 1 | true or false | correct data|
@@ -396,7 +396,7 @@ We will only discuss the case of a single BE. If the user cluster has more than
```
Modify the configuration in fe.conf
- max_broker_concurrency = BE 个数
+ max_broker_concurrency = BE number
The amount of data processed by a single BE for the current import task = the original file size / max_broker_concurrency
Max_bytes_per_broker_scanner >= the amount of data processed by a single BE of the current import task
@@ -464,10 +464,10 @@ Cluster situation: The number of BEs in the cluster is about 3, and the Broker n
## Common Questions
-* 导入报错：`Scan bytes per broker scanner exceed limit:xxx`
+* failed with : `Scan bytes per broker scanner exceed limit:xxx`
Refer to the Best Practices section of the document to modify the FE configuration items `max_bytes_per_broker_scanner` and `max_broker_concurrency'.`
-* 导入报错：`failed to send batch` 或 `TabletWriter add batch with unknown id`
+* failed with ：`failed to send batch` or `TabletWriter add batch with unknown id`
Refer to **General System Configuration** in **BE Configuration** in the Import Manual (./load-manual.md), and modify `tablet_writer_rpc_timeout_sec` and `streaming_load_rpc_max_alive_time_sec` appropriately.
diff --git a/docs/documentation/en/administrator-guide/load-data/load-manual_EN.md b/docs/documentation/en/administrator-guide/load-data/load-manual_EN.md
index f571bfb..b75d170 100644
--- a/docs/documentation/en/administrator-guide/load-data/load-manual_EN.md
+++ b/docs/documentation/en/administrator-guide/load-data/load-manual_EN.md
@@ -167,7 +167,7 @@ The following sections explain several system-level configurations that are comm
The following configuration belongs to the system configuration of FE, which can be modified by modifying the configuration file ``fe.conf``.
-+ max\_load\_timeout\_second 和 min\_load\_timeout\_second
++ max\_load\_timeout\_second and min\_load\_timeout\_second
The two configurations mean the maximum import timeout time and the minimum import timeout time in seconds. The default maximum timeout time is 3 days and the default minimum timeout time is 1 second. User-defined import timeouts should not exceed this range. This parameter is applicable to all import modes.
diff --git a/docs/documentation/en/administrator-guide/operation/metadata-operation_EN.md b/docs/documentation/en/administrator-guide/operation/metadata-operation_EN.md
index 9b9a72d..caa626c 100644
--- a/docs/documentation/en/administrator-guide/operation/metadata-operation_EN.md
+++ b/docs/documentation/en/administrator-guide/operation/metadata-operation_EN.md
@@ -138,7 +138,7 @@ Adding FE processes is described in detail in the [Deployment and Upgrade Docume
* The first time you start a new FE, you must make sure that the `meta_dir` of the FE is created, has correct permissions and is empty.
* Starting a new FE and executing the `ALTER SYSTEM ADD FOLLOWER/OBSERVER` statement adds FE to metadata in a sequence that is not required. If a new FE is started first and no statement is executed, the `current node is not added to the group. Please add it first.` in the new FE log. When the statement is executed, it enters the normal process.
* Make sure that after the previous FE is added successfully, the next FE is added.
- * 建议直接连接到 MASTER FE 执行 `ALTER SYSTEM ADD FOLLOWER/OBSERVER` 语句。
+ * Connect to MASTER FE and execute `ALTER SYSTEM ADD FOLLOWER/OBSERVER` claus。
2. Common problems
@@ -283,7 +283,7 @@ The deployment recommendation of FE is described in the Installation and [Deploy
## Other common problems
-1. fe.log 中一直滚动 `meta out of date. current time: xxx, synchronized time: xxx, has log: xxx, fe type: xxx`
+1. Output `meta out of date. current time: xxx, synchronized time: xxx, has log: xxx, fe type: xxx` in fe.log
This is usually because the FE cannot elect Master. For example, if three FOLLOWERs are configured, but only one FOLLOWER is started, this FOLLOWER will cause this problem. Usually, just start the remaining FOLLOWER. If the problem has not been solved after the start-up, manual recovery may be required in accordance with the way in the `Failure Recovery` section.
diff --git a/docs/documentation/en/administrator-guide/small-file-mgr_EN.md b/docs/documentation/en/administrator-guide/small-file-mgr_EN.md
index 54f23be..4a6d994 100644
--- a/docs/documentation/en/administrator-guide/small-file-mgr_EN.md
+++ b/docs/documentation/en/administrator-guide/small-file-mgr_EN.md
@@ -92,6 +92,6 @@ Because the file meta-information and content are stored in FE memory. So by def
> If you need to upload more files or increase the size limit of a single file, you can modify the `max_small_file_size_bytes` and `max_small_file_number` parameters by using the `ADMIN SET CONFIG` command. However, the increase in the number and size of files will lead to an increase in FE memory usage.
-2. BE 配置
+2. BE configuration
* `Small_file_dir`: The path used to store files downloaded from FE by default is in the `lib/small_files/` directory of the BE runtime directory.
diff --git a/docs/documentation/en/community/how-to-contribute_EN.md b/docs/documentation/en/community/how-to-contribute_EN.md
index c027c77..8e540f1 100644
--- a/docs/documentation/en/community/how-to-contribute_EN.md
+++ b/docs/documentation/en/community/how-to-contribute_EN.md
@@ -31,7 +31,7 @@ Any questions, you can contact us to get timely answers, including Wechat, Gitte
For the first time in Doris community, you can:
-* 关注 [Doris Github](https://github.com/apache/incubator-doris)
+* Follow [Doris Github](https://github.com/apache/incubator-doris)
* Subscribe to our [mailing list] (./subscribe-mail-list.md);
* Join Doris Wechat Group (add micro-signal: morningman-cmy, note: join Doris Group) and ask questions at any time.
* Enter Doris's [Gitter] (./gitter.md) chat room;
@@ -47,7 +47,7 @@ As you can see from [GitHub] (https://github.com/apache/incubator-doris), Apache
| [Frontend daemon (FE)] (https://github.com/apache/incubator-doris) | consists of a query coordinator and a metadata manager | Java|
| [Backend daemon (BE)] (https://github.com/apache/incubator-doris) | Responsible for storing data and executing query fragments | C++|
| [Broker] (https://github.com/apache/incubator-doris) | Read HDFS data to Doris | Java|
-| [Website](https://github.com/apache/incubator-doris-website) | Doris 网站 | Markdown |
+| [Website](https://github.com/apache/incubator-doris-website) | Doris Website | Markdown |
+ [Github Wiki] (https://github.com/apache/incubator-doris/wiki); Doris Github Wiki; Markdown_;
| Doris Runtime Help Document | Online Help Manual at Doris Runtime | Markdown|
diff --git a/docs/documentation/en/community/release-process_EN.md b/docs/documentation/en/community/release-process_EN.md
index 809d321..b1a7689 100644
--- a/docs/documentation/en/community/release-process_EN.md
+++ b/docs/documentation/en/community/release-process_EN.md
@@ -177,7 +177,7 @@ sub 4096R/0E8182E6 2018-12-06
xxx-yy is the user ID.
```
-gpg --armor --output public-key.txt --export [用户ID]
+gpg --armor --output public-key.txt --export [UserID]
```
```
@@ -220,7 +220,7 @@ Because the public key server has no checking mechanism, anyone can upload the p
Fingerprint parameter generates public key fingerprints:
```
-gpg --fingerprint [用户ID]
+gpg --fingerprint [UserID]
```
```
@@ -635,7 +635,7 @@ https://www.apache.org/dist/incubator/doris/0.9.0-incubating/
http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
-源码包（source package）:
+Source package:
http://www.apache.org/dyn/closer.cgi/incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz
ASC:
diff --git a/docs/documentation/en/installing/install-deploy_EN.md b/docs/documentation/en/installing/install-deploy_EN.md
index 7c5c6cc..c2cc247 100644
--- a/docs/documentation/en/installing/install-deploy_EN.md
+++ b/docs/documentation/en/installing/install-deploy_EN.md
@@ -113,9 +113,9 @@ This is a representation of [CIDR] (https://en.wikipedia.org/wiki/Classless_Inte
**Note**: When priority networks is configured and FE or BE is started, only the correct IP binding of FE or BE is ensured. In ADD BACKEND or ADD FRONTEND statements, you also need to specify IP matching priority networks configuration, otherwise the cluster cannot be established. Give an example:
-BE is configured as `priority_networks = 10.1.3.0/24'.`
+BE is configured as `priority_networks = 10.1.3.0/24'.`.
-但是在 ADD BACKEND 时使用的是：`ALTER SYSTEM ADD BACKEND "192.168.0.1:9050";`
+When you want to ADD BACKEND use ：`ALTER SYSTEM ADD BACKEND "192.168.0.1:9050";`
Then FE and BE will not be able to communicate properly.
@@ -308,11 +308,11 @@ The DROP statement is as follows:
**Note: DROP BACKEND will delete the BE directly and the data on it will not be recovered!!! So we strongly do not recommend DROP BACKEND to delete BE nodes. When you use this statement, there will be corresponding error-proof operation hints.**
-DECOMMISSION 语句如下：
+DECOMMISSION clause：
```ALTER SYSTEM DECOMMISSION BACKEND "be_host:be_heartbeat_service_port";```
-> DECOMMISSION 命令说明：
+> DECOMMISSION notes:
>
> 1. This command is used to safely delete BE nodes. After the command is issued, Doris attempts to migrate the data on the BE to other BE nodes, and when all data is migrated, Doris automatically deletes the node.
> 2. The command is an asynchronous operation. After execution, you can see that the BE node's isDecommission status is true through ``SHOW PROC '/backends';` Indicates that the node is offline.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org