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 a95ce69 [Doc] Bug fix that help commend not work (#4760)
a95ce69 is described below
commit a95ce69c0db17216fcc989e7ec76cc118453c26a
Author: Mingyu Chen <morningman....@gmail.com>
AuthorDate: Tue Oct 20 09:47:51 2020 +0800
[Doc] Bug fix that help commend not work (#4760)
There are 2 docs with same name "bitmap", which cause error
when building help system.
---
docs/.vuepress/sidebar/en.js | 2 +-
docs/.vuepress/sidebar/zh-CN.js | 2 +-
.../aggregate-functions/{bitmap.md => bitmap_union.md} | 6 +++---
.../en/sql-reference/sql-functions/bitmap-functions/bitmap_union.md | 3 ++-
.../aggregate-functions/{bitmap.md => bitmap_union.md} | 6 +++---
.../sql-reference/sql-functions/bitmap-functions/bitmap_union.md | 3 ++-
fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java | 6 ++++++
7 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/docs/.vuepress/sidebar/en.js b/docs/.vuepress/sidebar/en.js
index f3a0fc1..bbbc2c6 100644
--- a/docs/.vuepress/sidebar/en.js
+++ b/docs/.vuepress/sidebar/en.js
@@ -312,7 +312,7 @@ module.exports = [
directoryPath: "aggregate-functions/",
children: [
"avg",
- "bitmap",
+ "bitmap_union",
"count",
"hll_union_agg",
"max",
diff --git a/docs/.vuepress/sidebar/zh-CN.js b/docs/.vuepress/sidebar/zh-CN.js
index b148691..9a4b8d7 100644
--- a/docs/.vuepress/sidebar/zh-CN.js
+++ b/docs/.vuepress/sidebar/zh-CN.js
@@ -318,7 +318,7 @@ module.exports = [
directoryPath: "aggregate-functions/",
children: [
"avg",
- "bitmap",
+ "bitmap_union",
"count",
"hll_union_agg",
"max",
diff --git a/docs/en/sql-reference/sql-functions/aggregate-functions/bitmap.md
b/docs/en/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
similarity index 97%
rename from docs/en/sql-reference/sql-functions/aggregate-functions/bitmap.md
rename to
docs/en/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
index a53488b..ddffeb8 100644
--- a/docs/en/sql-reference/sql-functions/aggregate-functions/bitmap.md
+++ b/docs/en/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
@@ -1,6 +1,6 @@
---
{
- "title": "BITMAP",
+ "title": "BITMAP_UNION",
"language": "en"
}
---
@@ -25,7 +25,7 @@ under the License.
-->
-# BITMAP
+# BITMAP_UNION
## Create table
@@ -143,4 +143,4 @@ where page in ('meituan', 'waimai');
## keyword
-BITMAP, BITMAP_COUNT, BITMAP_EMPTY, BITMAP_UNION, BITMAP_UNION_INT, TO_BITMAP,
BITMAP_UNION_COUNT, INTERSECT_COUNT
\ No newline at end of file
+BITMAP, BITMAP_COUNT, BITMAP_EMPTY, BITMAP_UNION, BITMAP_UNION_INT, TO_BITMAP,
BITMAP_UNION_COUNT, INTERSECT_COUNT
diff --git
a/docs/en/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
b/docs/en/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
index 4e92f97..bf47408 100644
--- a/docs/en/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
+++ b/docs/en/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
@@ -24,7 +24,8 @@ specific language governing permissions and limitations
under the License.
-->
-# bitmap_union
+# bitmap_union function
+
## description
Aggregate function, used to calculate the grouped bitmap union. Common usage
scenarios such as: calculating PV, UV.
diff --git
a/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap.md
b/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
similarity index 97%
rename from docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap.md
rename to
docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
index a9ba0e4..fd2e72e 100644
--- a/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap.md
+++ b/docs/zh-CN/sql-reference/sql-functions/aggregate-functions/bitmap_union.md
@@ -1,6 +1,6 @@
---
{
- "title": "BITMAP",
+ "title": "BITMAP_UNION",
"language": "zh-CN"
}
---
@@ -24,7 +24,7 @@ specific language governing permissions and limitations
under the License.
-->
-# BITMAP
+# BITMAP_UNION
## Create table
@@ -143,4 +143,4 @@ where page in ('meituan', 'waimai');
## keyword
-BITMAP,BITMAP_COUNT,BITMAP_EMPTY,BITMAP_UNION,BITMAP_UNION_INT,TO_BITMAP,BITMAP_UNION_COUNT,INTERSECT_COUNT
\ No newline at end of file
+BITMAP,BITMAP_COUNT,BITMAP_EMPTY,BITMAP_UNION,BITMAP_UNION_INT,TO_BITMAP,BITMAP_UNION_COUNT,INTERSECT_COUNT
diff --git
a/docs/zh-CN/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
b/docs/zh-CN/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
index 295e118..89b25b8 100644
--- a/docs/zh-CN/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
+++ b/docs/zh-CN/sql-reference/sql-functions/bitmap-functions/bitmap_union.md
@@ -24,7 +24,8 @@ specific language governing permissions and limitations
under the License.
-->
-# bitmap_union
+# bitmap_union function
+
## description
聚合函数，用于计算分组后的 bitmap 并集。常见使用场景如：计算PV，UV。
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
index 72cf29e..ecbbf24 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/HelpTopic.java
@@ -96,4 +96,10 @@ public class HelpTopic implements HelpObjectIface {
this.category = category;
}
}
+
+ @Override
+ public String toString() {
+ return "name: " + name + ", desc: " + description;
+ }
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
