From 3c2e455f750f6faa60b7dd5b06d3c78a4e36f002 Mon Sep 17 00:00:00 2001 From: amber-create <48005258@qq.com> Date: Wed, 27 Mar 2024 15:00:10 +0800 Subject: [PATCH 1/2] [Doc] fix path inconsistency in code in stream load user guide doc (#43210) (cherry picked from commit 4d224e13ddafdf0d113d7e0e52cb93fc12cf99dc) # Conflicts: # docs/en/loading/StreamLoad.md --- docs/en/loading/StreamLoad.md | 7 +++++-- docs/zh/loading/StreamLoad.md | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/en/loading/StreamLoad.md b/docs/en/loading/StreamLoad.md index 59efa727e0590..28a29397bb087 100644 --- a/docs/en/loading/StreamLoad.md +++ b/docs/en/loading/StreamLoad.md @@ -288,6 +288,7 @@ Broker Load is an asynchronous loading method. After you submit a load job, Star - Currently Broker Load supports loading from a local file system only through a single broker whose version is v2.5 or later. - Highly concurrent queries against a single broker may cause issues such as timeout and OOM. To mitigate the impact, you can use the `pipeline_dop` variable (see [System variable](../reference/System_variable.md#pipeline_dop)) to set the query parallelism for Broker Load. For queries against a single broker, we recommend that you set `pipeline_dop` to a value smaller than `16`. +<<<<<<< HEAD ### Before you begin Before you can use Broker Load to load data from a local file system, finish the following preparations: @@ -304,6 +305,8 @@ Before you can use Broker Load to load data from a local file system, finish the ALTER SYSTEM ADD BROKER sole_broker "172.26.199.40:8000"; ``` +======= +>>>>>>> 4d224e13dd ([Doc] fix path inconsistency in code in stream load user guide doc (#43210)) ### Typical example Broker Load supports loading from a single data file to a single table, loading from multiple data files to a single table, and loading from multiple data files to multiple tables. This section uses loading from multiple data files to a single table as an example. @@ -312,7 +315,7 @@ Note that in StarRocks some literals are used as reserved keywords by the SQL la #### Prepare datasets -Use the CSV file format as an example. Log in to your local file system, and create two CSV files, `file1.csv` and `file2.csv`, in a specific storage location (for example, `/user/starrocks/`). Both files consist of three columns, which represent the user ID, user name, and user score in sequence. +Use the CSV file format as an example. Log in to your local file system, and create two CSV files, `file1.csv` and `file2.csv`, in a specific storage location (for example, `/home/disk1/business/`). Both files consist of three columns, which represent the user ID, user name, and user score in sequence. - `file1.csv` @@ -358,7 +361,7 @@ PROPERTIES("replication_num"="1"); #### Start a Broker Load -Run the following command to start a Broker Load job that loads data from all data files (`file1.csv` and `file2.csv`) stored in the `/user/starrocks/` path of your local file system to the StarRocks table `mytable`: +Run the following command to start a Broker Load job that loads data from all data files (`file1.csv` and `file2.csv`) stored in the `/home/disk1/business/` path of your local file system to the StarRocks table `mytable`: ```SQL LOAD LABEL mydatabase.label_local diff --git a/docs/zh/loading/StreamLoad.md b/docs/zh/loading/StreamLoad.md index 98f2e28ddbb92..6258de705d3be 100644 --- a/docs/zh/loading/StreamLoad.md +++ b/docs/zh/loading/StreamLoad.md @@ -311,7 +311,7 @@ Broker Load 支持导入单个数据文件到单张表、导入多个数据文 #### 数据样例 -以 CSV 格式的数据为例，登录本地文件系统，在指定路径（假设为 `/user/starrocks/`）下创建两个 CSV 格式的数据文件，`file1.csv` 和 `file2.csv`。两个数据文件都包含三列，分别代表用户 ID、用户姓名和用户得分，如下所示： +以 CSV 格式的数据为例，登录本地文件系统，在指定路径（假设为 `/home/disk1/business/`）下创建两个 CSV 格式的数据文件，`file1.csv` 和 `file2.csv`。两个数据文件都包含三列，分别代表用户 ID、用户姓名和用户得分，如下所示： - `file1.csv` @@ -359,7 +359,7 @@ PROPERTIES("replication_num"="1"); #### 提交导入作业 -通过如下语句，把本地文件系统的 `/user/starrocks/` 路径下所有数据文件（`file1.csv` 和 `file2.csv`）的数据导入到目标表 `mytable`： +通过如下语句，把本地文件系统的 `/home/disk1/business/` 路径下所有数据文件（`file1.csv` 和 `file2.csv`）的数据导入到目标表 `mytable`： ```SQL LOAD LABEL mydatabase.label_local @@ -472,7 +472,7 @@ WHERE LABEL = "label_local"; 1. 把 NAS 挂载到所有的 BE、FE 节点，同时保证所有节点的挂载路径完全一致。这样，所有 BE 可以像访问 BE 自己的本地文件一样访问 NAS。 -2. 使用 Broker Load 导入数据。 +2. 使用 Broker Load 导入数据。例如： ```SQL LOAD LABEL test_db.label_nas From bfdb223ae8529c589f757844aceca22938b7310d Mon Sep 17 00:00:00 2001 From: amber-create <48005258@qq.com> Date: Wed, 27 Mar 2024 15:12:38 +0800 Subject: [PATCH 2/2] Update StreamLoad.md Signed-off-by: amber-create <48005258@qq.com> --- docs/en/loading/StreamLoad.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/en/loading/StreamLoad.md b/docs/en/loading/StreamLoad.md index 28a29397bb087..aada8d4bf1d9e 100644 --- a/docs/en/loading/StreamLoad.md +++ b/docs/en/loading/StreamLoad.md @@ -288,7 +288,6 @@ Broker Load is an asynchronous loading method. After you submit a load job, Star - Currently Broker Load supports loading from a local file system only through a single broker whose version is v2.5 or later. - Highly concurrent queries against a single broker may cause issues such as timeout and OOM. To mitigate the impact, you can use the `pipeline_dop` variable (see [System variable](../reference/System_variable.md#pipeline_dop)) to set the query parallelism for Broker Load. For queries against a single broker, we recommend that you set `pipeline_dop` to a value smaller than `16`. -<<<<<<< HEAD ### Before you begin Before you can use Broker Load to load data from a local file system, finish the following preparations: @@ -305,8 +304,6 @@ Before you can use Broker Load to load data from a local file system, finish the ALTER SYSTEM ADD BROKER sole_broker "172.26.199.40:8000"; ``` -======= ->>>>>>> 4d224e13dd ([Doc] fix path inconsistency in code in stream load user guide doc (#43210)) ### Typical example Broker Load supports loading from a single data file to a single table, loading from multiple data files to a single table, and loading from multiple data files to multiple tables. This section uses loading from multiple data files to a single table as an example.