Skip to content

Commit

Permalink
[fix](docs) fix some docs about stream load and select. (apache#15372)
Browse files Browse the repository at this point in the history
* [fix](docs) fix some docs about stream load and select.

* update
  • Loading branch information
luozenglin authored Dec 29, 2022
1 parent d95be84 commit e2603ca
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ The final result of the import is returned to the user by Coordinator BE.

## Support data format

Currently Stream Load supports two data formats: CSV (text) and JSON

Stream Load currently supports data formats: CSV (text), JSON, <version since="1.2" type="inline"> PARQUET and ORC</version>.
## Basic operations
### Create Load

Expand Down
4 changes: 2 additions & 2 deletions docs/en/docs/data-operate/import/load-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Different import methods support slightly different data formats.

| Import Methods | Supported Formats |
| -------------- | ----------------------- |
| Broker Load | Parquet, ORC, csv, gzip |
| Stream Load | csv, gzip, json |
| Broker Load | parquet, orc, csv, gzip |
| Stream Load | csv, json, parquet, orc |
| Routine Load | csv, json |

## import instructions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Parameter introduction:

11. exec_mem_limit: Import memory limit. Default is 2GB. The unit is bytes.

12. format: Specify the import data format, the default is csv, and csv_with_names(filter out the first row of your csv file), csv_with_names_and_types(filter out the first two lines of your csv file), json format are supported.
12. format: Specify load data format, support csv, json, <version since="1.2" type="inline"> csv_with_names(support csv file line header filter), csv_with_names_and_types(support csv file first two lines filter), parquet, orc</version>, default is csv.

13. jsonpaths: The way of importing json is divided into: simple mode and matching mode.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SELECT

6. `INTO OUTFILE 'file_name' ` : save the result to a new file (which did not exist before), the difference lies in the save format.

7. `Group by having`: Group the result set, and brush the result of group by when having appears. `Grouping Sets`, `Rollup`, `Cube` are extensions of group by, please refer to [GROUPING SETS DESIGN](../../../../../community/design/grouping_sets_design.md) for details.
7. `Group by having`: Group the result set, and brush the result of group by when having appears. `Grouping Sets`, `Rollup`, `Cube` are extensions of group by, please refer to [GROUPING SETS DESIGN](https://doris.apache.org/community/design/grouping_sets_design) for details.

8. `Order by`: Sort the final result, Order by sorts the result set by comparing the size of one or more columns.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Stream load 中,Doris 会选定一个节点作为 Coordinator 节点。该节

## 支持数据格式

目前 Stream Load 支持两个数据格式:CSV(文本) 和 JSON
目前 Stream Load 支持数据格式:CSV(文本)、JSON、<version since="1.2" type="inline"> PARQUET 和 ORC</version>。

## 基本操作

Expand Down
8 changes: 4 additions & 4 deletions docs/zh-CN/docs/data-operate/import/load-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ Doris 提供多种数据导入方案,可以针对不同的数据源进行选

不同的导入方式支持的数据格式略有不同。

| 导入方式 | 支持的格式 |
| 导入方式 | 支持的格式 |
| ------------ | ----------------------- |
| Broker Load | Parquet,ORC,csvgzip |
| Stream Load | csv, gzip, json |
| Routine Load | csv, json |
| Broker Load | parquet、orc、csvgzip |
| Stream Load | csvjson、parquet、orc |
| Routine Load | csvjson |

## 导入说明

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ curl --location-trusted -u user:passwd [-H ""...] -T data.file -XPUT http://fe_h

11. exec_mem_limit: 导入内存限制。默认为 2GB。单位为字节。

12. format: 指定导入数据格式,默认是csv,也支持:<version since="1.2" type="inline"> csv_with_names(支持csv文件行首过滤)csv_with_names_and_types(支持csv文件前两行过滤) </version> 或 json格式
12. format: 指定导入数据格式,支持csv、json、<version since="1.2" type="inline"> csv_with_names(支持csv文件行首过滤)csv_with_names_and_types(支持csv文件前两行过滤)、parquet、orc</version>,默认是csv

13. jsonpaths: 导入json方式分为:简单模式和匹配模式。

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SELECT

6. `INTO OUTFILE 'file_name' ` :保存结果至新文件(之前不存在)中,区别在于保存的格式。

7. `Group by having`:对结果集进行分组,having 出现则对 group by 的结果进行刷选。`Grouping Sets``Rollup``Cube` 为group by的扩展,详细可参考[GROUPING SETS 设计文档](../../../../../community/design/grouping_sets_design.md)
7. `Group by having`:对结果集进行分组,having 出现则对 group by 的结果进行刷选。`Grouping Sets``Rollup``Cube` 为group by的扩展,详细可参考[GROUPING SETS 设计文档](https://doris.apache.org/zh-CN/community/design/grouping_sets_design)

8. `Order by `: 对最后的结果进行排序,Order by 通过比较一列或者多列的大小来对结果集进行排序。

Expand Down

0 comments on commit e2603ca

Please sign in to comment.