This is an automated email from the ASF dual-hosted git repository.
luzhijing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new 903d14c318e9 [docs] Update Database Connect and some EN docs (#430)
903d14c318e9 is described below
commit 903d14c318e963296943528739b2decf8acf6b7d
Author: KassieZ <[email protected]>
AuthorDate: Tue Mar 19 21:49:06 2024 +0800
[docs] Update Database Connect and some EN docs (#430)
---
.../version-2.0.json | 4 +
.../version-2.0/db-connect/database-connect.md | 118 +++++++++++++++++++++
static/images/DBeaver-query.png | Bin 0 -> 329848 bytes
static/images/DBeaver.png | Bin 0 -> 218905 bytes
static/images/Doris-WebUI-Playground.png | Bin 0 -> 120740 bytes
static/images/Doris-WebUI.png | Bin 0 -> 373008 bytes
.../database-connect.md} | 4 +-
.../install/source-install/compilation-linux.md | 35 +++++-
.../query/pipeline/pipelinex-execution-engine.md | 15 ++-
.../query/query-data/common-table-expression.md | 20 +++-
.../version-2.0/query/query-data/complex-type.md | 8 +-
versioned_sidebars/version-2.0-sidebars.json | 19 ++--
12 files changed, 207 insertions(+), 16 deletions(-)
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0.json
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0.json
index 1da34f2af99e..144b26708a9a 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0.json
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0.json
@@ -23,6 +23,10 @@
"message": "K8s 部署",
"description": "The label for category Deploy on Kubernetes in sidebar
docs"
},
+ "sidebar.docs.category.Database Connect": {
+ "message": "数据库连接",
+ "description": "The label for category Deploy on Kubernetes in sidebar
docs"
+ },
"sidebar.docs.category.Table Design": {
"message": "数据表设计",
"description": "The label for category Table Design in sidebar docs"
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/db-connect/database-connect.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/db-connect/database-connect.md
new file mode 100644
index 000000000000..78e811bb9138
--- /dev/null
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/db-connect/database-connect.md
@@ -0,0 +1,118 @@
+---
+{
+ "title": "数据库连接",
+ "language": "zh-CN"
+}
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+Apache Doris 采用 MySQL 网络连接协议，兼容 MySQL 生态的命令行工具、JDBC/ODBC 和各种可视化工具。同时 Apache
Doris 也内置了一个简单的 Web UI，方便使用。下面分别介绍如何通过 MySQL Client、MySQL JDBC
Connector、DBeaver 和 Doris 内置的 Web UI 来连接 Doris。
+
+## MySQL Client
+
+从 MySQL 官方网站下载 MySQL Client，或者下载我们提供的 Linux 上免安装的 [MySQL
客户端](https://cdn.selectdb.com/download/mysql-client/mysql-5.7.22-linux-glibc2.12-x86_64.tar.gz)。当前
Doris 主要兼容 MySQL 5.7 及其以上的客户端。
+
+解压下载的 MySQL 客户端，在 `bin/` 目录下可以找到 `mysql` 命令行工具。然后执行下面的命令连接 Doris。
+
+```Bash
+# FE_IP 为 FE 的监听地址， FE_QUERY_PORT 为 FE 的 MYSQL 协议服务的端口，在 fe.conf 中对应
query_port, 默认为 9030.
+mysql -h FE_IP -P FE_QUERY_PORT -u USER_NAME
+```
+
+登录后，显示如下。
+
+```Bash
+Welcome to the MySQL monitor. Commands end with ; or \g.
+Your MySQL connection id is 236
+Server version: 5.7.99 Doris version doris-2.0.3-rc06-37d31a5
+
+Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+
+Oracle is a registered trademark of Oracle Corporation and/or its
+affiliates. Other names may be trademarks of their respective
+owners.
+
+Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+
+mysql>
+```
+
+## MySQL JDBC Connector
+
+请在 MySQL 官方网站下载相应的 JDBC Connector。
+
+连接代码示例如下：
+
+```Java
+String user = "user_name";
+String password = "user_password";
+String newUrl =
"jdbc:mysql://FE_IP:FE_PORT/demo？useUnicode=true&characterEncoding=utf8&useTimezone=true&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true";
+try {
+ Connection myCon = DriverManager.getConnection(newUrl, user, password);
+ Statement stmt = myCon.createStatement();
+ ResultSet result = stmt.executeQuery("show databases");
+ ResultSetMetaData metaData = result.getMetaData();
+ int columnCount = metaData.getColumnCount();
+ while (result.next()) {
+ for (int i = 1; i <= columnCount; i++) {
+ System.out.println(result.getObject(i));
+ }
+ }
+} catch (SQLException e) {
+ log.error("get JDBC connection exception.", e);
+}
+```
+
+## DBeaver
+
+创建一个到 Apache Doris 的 MySQL 连接：
+
+
+
+
+在 DBeaver 中进行查询：
+
+
+
+## Doris 内置的 Web UI
+
+Doris FE 内置 Web UI。用户无须安装 MySQL 客户端，即可通过内置的 Web UI 进行 SQL 查询和其它相关信息的查看。
+
+在浏览器中输入 http://fe_ip:fe_port, 比如 http://172.20.63.118:8030，打开 Doris 内置的 Web
控制台。
+
+内置 Web 控制台，主要供集群 root 账户使用，默认安装后 root 账户密码为空。
+
+
+
+比如，在 Playground 中，执行如下语句，可以完成对 BE 节点的添加。
+
+```sql
+ALTER SYSTEM ADD BACKEND "be_host_ip:heartbeat_service_port";
+```
+
+
+
+:::caution
+Playground 中执行这种和具体数据库/表没有关系的语句，务必在左侧库栏里随意选择一个数据库，才能执行成功，这个限制，稍后会去掉。
+
+当前内置的 Web 控制台，还不能执行 SET 类型的 SQL 语句，所以，在 Web 控制台，当前还不能通过执行 SET PASSWORD FOR
'user' = PASSWORD('user_password') `类似语句。
+:::
\ No newline at end of file
diff --git a/static/images/DBeaver-query.png b/static/images/DBeaver-query.png
new file mode 100644
index 000000000000..4793e4f6b0ef
Binary files /dev/null and b/static/images/DBeaver-query.png differ
diff --git a/static/images/DBeaver.png b/static/images/DBeaver.png
new file mode 100644
index 000000000000..2029dd862dfe
Binary files /dev/null and b/static/images/DBeaver.png differ
diff --git a/static/images/Doris-WebUI-Playground.png
b/static/images/Doris-WebUI-Playground.png
new file mode 100644
index 000000000000..2bafbd2cb119
Binary files /dev/null and b/static/images/Doris-WebUI-Playground.png differ
diff --git a/static/images/Doris-WebUI.png b/static/images/Doris-WebUI.png
new file mode 100644
index 000000000000..0d270c122b67
Binary files /dev/null and b/static/images/Doris-WebUI.png differ
diff --git a/versioned_docs/version-2.0/query/query-data/complex-type.md
b/versioned_docs/version-2.0/db-connect/database-connect.md
similarity index 94%
copy from versioned_docs/version-2.0/query/query-data/complex-type.md
copy to versioned_docs/version-2.0/db-connect/database-connect.md
index a2b60a15a604..696d0bf7484e 100644
--- a/versioned_docs/version-2.0/query/query-data/complex-type.md
+++ b/versioned_docs/version-2.0/db-connect/database-connect.md
@@ -1,6 +1,6 @@
---
{
- "title": "Complex Type",
+ "title": "数据库连接",
"language": "en"
}
---
@@ -24,4 +24,4 @@ specific language governing permissions and limitations
under the License.
-->
-Coming Soon
+Coming Soon
\ No newline at end of file
diff --git
a/versioned_docs/version-2.0/install/source-install/compilation-linux.md
b/versioned_docs/version-2.0/install/source-install/compilation-linux.md
index 871fb16ab761..052281ae8d08 100644
--- a/versioned_docs/version-2.0/install/source-install/compilation-linux.md
+++ b/versioned_docs/version-2.0/install/source-install/compilation-linux.md
@@ -24,4 +24,37 @@ specific language governing permissions and limitations
under the License.
-->
-Coming Soon
\ No newline at end of file
+This guide is about how to compile Doris on Linux using Ubuntu 16.04 or later
versions.
+
+## Make sure you have the following system dependencies installed.
+
+GCC 10+, Oracle JDK 8+, Python 2.7+, Apache Maven 3.5+, CMake 3.19.2+, Bison
3.0+
+
+```Plain
+sudo apt install build-essential openjdk-8-jdk maven cmake byacc flex automake
libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev curl git
ninja-build python
+sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+sudo apt update
+sudo apt install gcc-10 g++-10
+sudo apt-get install autoconf automake libtool autopoint
+```
+
+## Like compiling with a Docker development image, check if AVX2 instructions
are supported first.
+
+```Plain
+$ cat /proc/cpuinfo | grep avx2
+```
+
+## If supported, execute the following command for compilation.
+
+```Plain
+# By default, it builds AVX2 version.
+$ sh build.sh
+
+# If you need the no AVX2 version, add USE_AVX2=0.
+$ USE_AVX2=0 sh build.sh
+
+# To compile a debug version of BE, add BUILD_TYPE=Debug.
+$ BUILD_TYPE=Debug sh build.sh
+```
+
+## After compilation, the output files can be found in the `output/` directory.
\ No newline at end of file
diff --git
a/versioned_docs/version-2.0/query/pipeline/pipelinex-execution-engine.md
b/versioned_docs/version-2.0/query/pipeline/pipelinex-execution-engine.md
index 77059e7ff2dd..02734d8ee1e9 100644
--- a/versioned_docs/version-2.0/query/pipeline/pipelinex-execution-engine.md
+++ b/versioned_docs/version-2.0/query/pipeline/pipelinex-execution-engine.md
@@ -26,4 +26,17 @@ specific language governing permissions and limitations
under the License.
-->
-Coming Soon
\ No newline at end of file
+
+The PipelineX execution engine is an experimental feature introduced in
version 2.1 of Doris. Its goal is to address four major issues with the Doris
pipeline engine:
+
+1. In terms of concurrent execution, the current Doris execution concurrency
is constrained by two factors: parameters set by the FE and the limitation
imposed by the number of buckets in the storage layer. This static concurrency
prevents the execution engine from fully utilizing machine resources.
+
+2. In terms of execution logic, the current Doris implementation incurs some
fixed overhead. For example, the expression part of each instance is
independent of others, but the initialization parameters for instances have
many common parts. As a result, many redundant initialization steps are
required.
+
+3. In terms of scheduling logic, the current pipeline scheduler places all
blocked tasks in a blocking queue, which is polled by a single thread to move
executable tasks to the runnable queue. Consequently, during query execution,
one CPU core is consistently dedicated to scheduling overhead.
+
+4. In terms of profiling, the current pipeline implementation does not provide
users with simple and understandable metrics.
+
+:::tip
+To use the latest PipelineX execution engine, please refer to Doris version
2.1.
+:::
\ No newline at end of file
diff --git
a/versioned_docs/version-2.0/query/query-data/common-table-expression.md
b/versioned_docs/version-2.0/query/query-data/common-table-expression.md
index 74918c64191c..f51b304b052e 100644
--- a/versioned_docs/version-2.0/query/query-data/common-table-expression.md
+++ b/versioned_docs/version-2.0/query/query-data/common-table-expression.md
@@ -24,4 +24,22 @@ specific language governing permissions and limitations
under the License.
-->
-Coming Soon
+
+Common Table Expressions (CTEs) define a temporary result set that can be
referenced multiple times within the scope of an SQL statement. CTEs are
primarily used in SELECT statements.
+
+To specify a CTE, use the WITH clause with one or more comma-separated
clauses. Each clause provides a subquery that generates a result set and
associates a name with the subquery.
+
+The following example defines CTEs named `cte1` and `cte2` within the `WITH`
clause and refers to them in the top-level `SELECT` below the `WITH` clause:
+
+```sql
+WITH
+ cte1 AS (SELECT a, b FROM table1),
+ cte2 AS (SELECT c, d FROM table2)
+SELECT b, d FROM cte1 JOIN cte2
+WHERE cte1.a = cte2.c;
+```
+
+
+Within the statement that contains the `WITH` clause, you can reference each
CTE name to access the corresponding CTE result set. CTE names can be
referenced in other CTEs, allowing you to define CTEs based on other CTEs.
+
+CTEs can also refer to themselves to define recursive CTEs. Recursive CTEs are
commonly used for generating and traversing hierarchical or tree-like
structured data.
\ No newline at end of file
diff --git a/versioned_docs/version-2.0/query/query-data/complex-type.md
b/versioned_docs/version-2.0/query/query-data/complex-type.md
index a2b60a15a604..e9a2f19c9966 100644
--- a/versioned_docs/version-2.0/query/query-data/complex-type.md
+++ b/versioned_docs/version-2.0/query/query-data/complex-type.md
@@ -24,4 +24,10 @@ specific language governing permissions and limitations
under the License.
-->
-Coming Soon
+Doris supports complex types such as Array, Map, Struct, and JSON.
+
+Doris provides various functions specifically designed for these complex types.
+
+For detailed information on the supported functions, please refer to the SQL
manual- [Array
functions](../../sql-manual/sql-functions/array-functions/array), [SQL
manual-Struct
functions](../../sql-manual/sql-functions/struct-functions/struct), and [SQL
manual-JSON
functions](../../sql-manual/sql-functions/json-functions/json-parse).
+
+To check the support for Map functions, you can refer to the SQL manual docs
under the section for the [MAP](../../sql-manual/sql-reference/Data-Types/MAP)
data type.
diff --git a/versioned_sidebars/version-2.0-sidebars.json
b/versioned_sidebars/version-2.0-sidebars.json
index 6a830a2b1392..a5c09d461676 100644
--- a/versioned_sidebars/version-2.0-sidebars.json
+++ b/versioned_sidebars/version-2.0-sidebars.json
@@ -48,6 +48,13 @@
}
]
},
+ {
+ "type": "category",
+ "label": "Database Connect",
+ "items": [
+ "db-connect/database-connect"
+ ]
+ },
{
"type": "category",
"label": "Table Design",
@@ -1372,16 +1379,8 @@
"releasenotes/release-2.0.3",
"releasenotes/release-2.0.2",
"releasenotes/release-2.0.1",
- "releasenotes/release-2.0.0",
- "releasenotes/release-1.2.8",
- "releasenotes/release-1.2.7",
- "releasenotes/release-1.2.6",
- "releasenotes/release-1.2.5",
- "releasenotes/release-1.2.4",
- "releasenotes/release-1.2.3",
- "releasenotes/release-1.2.2",
- "releasenotes/release-1.2.1",
- "releasenotes/release-1.2.0"
+ "releasenotes/release-2.0.0"
+
]
}
]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
