From bfc25d68c27781c40cf22dd126e18c6afc971b57 Mon Sep 17 00:00:00 2001 From: HappenLee Date: Thu, 27 May 2021 12:16:21 +0800 Subject: [PATCH] [BUG] Fix the bug of `Desc Query` cause `Unknown error` and some doc revise --- docs/en/installing/compilation.md | 6 +++--- docs/zh-CN/administrator-guide/bucket-shuffle-join.md | 2 +- docs/zh-CN/installing/compilation.md | 6 +++--- .../src/main/java/org/apache/doris/qe/StmtExecutor.java | 9 +++++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/en/installing/compilation.md b/docs/en/installing/compilation.md index 927fb31b69da5a..9fd8f2bbd372d4 100644 --- a/docs/en/installing/compilation.md +++ b/docs/en/installing/compilation.md @@ -51,10 +51,10 @@ Note: For different versions of Oris, you need to download the corresponding mir |---|---|---| | apachedoris/doris-dev:build-env | before [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x | | apachedoris/doris-dev:build-env-1.1 | [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) or later | 0.10.x or later | -| apachedoris/doris-dev:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) or later | 0.12.x or later | -| apachedoris/doris-dev:build-env-1.3 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | 0.14.x or later | +| apachedoris/doris-dev:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) or later | 0.12.x - 0.14.0 | +| apachedoris/doris-dev:build-env-1.3 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | later | -Warning: Doris 0.14.0 still used apachedoris/doris-dev:build-env-1.2 to compile. After thie version, the code will use apachedoris/doris-dev:build-env-1.3 to compile . **In the docker image of build-env-1.3, the default JDK version is upgraded to 11. So FE will use OPENJDK 11 to compile. If the docker image after build-env-1.3 is used for compilation of FE, the Java version of FE running env also needs to be upgraded to JDK11 or above. Otherwise unexpected running errors may be caused. ** +Warning: Doris 0.14.0 still used apachedoris/doris-dev:build-env-1.2 to compile. After thie version, the code will use apachedoris/doris-dev:build-env-1.3 to compile . **In the docker image of build-env-1.3, the default JDK version is upgraded to 11. So FE will use OPENJDK 11 to compile. If the docker image after build-env-1.3 is used for compilation of FE, the Java version of FE running env also needs to be upgraded to JDK11, Otherwise unexpected running errors may be caused. ** 2. Running Mirror diff --git a/docs/zh-CN/administrator-guide/bucket-shuffle-join.md b/docs/zh-CN/administrator-guide/bucket-shuffle-join.md index 38cd33a8b19979..6f629dd41697e8 100644 --- a/docs/zh-CN/administrator-guide/bucket-shuffle-join.md +++ b/docs/zh-CN/administrator-guide/bucket-shuffle-join.md @@ -70,7 +70,7 @@ Doris支持的常规分布式Join方式包括了shuffle join 和broadcast join set enable_bucket_shuffle_join = true; ``` -在FE进行分布式查询规划时，优先选择的顺序为 Colocate Join -> Bucket Shuffle Join -> Brocast Join -> Shuffle Join。但是如果用户显式hint了Join的类型，如： +在FE进行分布式查询规划时，优先选择的顺序为 Colocate Join -> Bucket Shuffle Join -> Broadcast Join -> Shuffle Join。但是如果用户显式hint了Join的类型，如： ``` select * from test join [shuffle] baseall on test.k1 = baseall.k1; diff --git a/docs/zh-CN/installing/compilation.md b/docs/zh-CN/installing/compilation.md index c54c3b29664829..16be7bc5b36635 100644 --- a/docs/zh-CN/installing/compilation.md +++ b/docs/zh-CN/installing/compilation.md @@ -51,10 +51,10 @@ under the License. |---|---|---| | apachedoris/doris-dev:build-env | before [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x | | apachedoris/doris-dev:build-env-1.1 | [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.10.x, 0.11.x | -| apachedoris/doris-dev:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) | 0.12.x, 0.13 | -| apachedoris/doris-dev:build-env-1.3 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 0.14.x 或更新版本 | +| apachedoris/doris-dev:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) | 0.12.x - 0.14.0 | +| apachedoris/doris-dev:build-env-1.3 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 后续的发布版本 | -注意: doris 0.14.0 版本仍然使用apachedoris/doris-dev:build-env-1.2 编译，之后的代码将使用apachedoris/doris-dev:build-env-1.3。**在build-env-1.3的docker镜像中，默认的JDK的版本升级到了11，所以FE将会使用OpenJDK 11进行编译。如果使用build-env-1.3之后的docker镜像进行FE编译的话，后续运行FE的Java版本也需要同时升级到JDK11以上，否则可能导致非预期的运行错误。** +注意: doris 0.14.0 版本仍然使用apachedoris/doris-dev:build-env-1.2 编译，之后的代码将使用apachedoris/doris-dev:build-env-1.3。**在build-env-1.3的docker镜像中，默认的JDK的版本升级到了11，所以FE将会使用OpenJDK 11进行编译。如果使用build-env-1.3之后的docker镜像进行FE编译的话，后续运行FE的Java版本也需要同时升级到JDK11，否则可能导致非预期的运行错误。** 2. 运行镜像 diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java index 7957c8f5e6e6c9..eaa5b29b66af51 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -294,7 +294,10 @@ public void execute(TUniqueId queryId) throws Exception { context.setQueryId(newQueryId); } handleQueryStmt(); - writeProfile(true); + // explain query stmt do not have profile + if (!((QueryStmt) parsedStmt).isExplain()) { + writeProfile(true); + } break; } catch (RpcException e) { if (i == retryTime - 1) { @@ -320,7 +323,9 @@ public void execute(TUniqueId queryId) throws Exception { } else if (parsedStmt instanceof InsertStmt) { // Must ahead of DdlStmt because InserStmt is its subclass try { handleInsertStmt(); - writeProfile(true); + if (!((InsertStmt) parsedStmt).getQueryStmt().isExplain()) { + writeProfile(true); + } } catch (Throwable t) { LOG.warn("handle insert stmt fail", t); // the transaction of this insert may already begun, we will abort it at outer finally block.