This is an automated email from the ASF dual-hosted git repository.
zhaoc 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 838c1e9 Modify HLL functions return type (#3656)
838c1e9 is described below
commit 838c1e921226a734186f8cbbff10bbd937c6f08d
Author: HangyuanLiu <[email protected]>
AuthorDate: Sun May 24 21:22:43 2020 +0800
Modify HLL functions return type (#3656)
1、Modify hll_hash function return type to HLL
2、Make HLL_RAW_AGG is alias of HLL_UNION
---
fe/src/main/cup/sql_parser.cup | 2 ++
fe/src/main/java/org/apache/doris/catalog/FunctionSet.java | 12 +++++++++++-
gensrc/script/doris_builtins_functions.py | 4 ++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fe/src/main/cup/sql_parser.cup b/fe/src/main/cup/sql_parser.cup
index 0f6740d..5c66fe3 100644
--- a/fe/src/main/cup/sql_parser.cup
+++ b/fe/src/main/cup/sql_parser.cup
@@ -4369,6 +4369,8 @@ keyword ::=
{: RESULT = id; :}
| KW_FORMAT:id
{: RESULT = id; :}
+ | KW_HLL_UNION:id
+ {: RESULT = id; :}
| KW_PATH:id
{: RESULT = id; :}
| KW_FUNCTION:id
diff --git a/fe/src/main/java/org/apache/doris/catalog/FunctionSet.java
b/fe/src/main/java/org/apache/doris/catalog/FunctionSet.java
index 256a461..4f9a0c7 100644
--- a/fe/src/main/java/org/apache/doris/catalog/FunctionSet.java
+++ b/fe/src/main/java/org/apache/doris/catalog/FunctionSet.java
@@ -1026,7 +1026,17 @@ public class FunctionSet {
"_ZN5doris12HllFunctions12hll_finalizeEPN9doris_udf15FunctionContextERKNS1_9StringValE",
true, true, true));
- // HLL_RAW_AGG
+ // HLL_UNION
+ addBuiltin(AggregateFunction.createBuiltin("hll_union",
+ Lists.newArrayList(t), Type.HLL, Type.HLL,
+
"_ZN5doris12HllFunctions8hll_initEPN9doris_udf15FunctionContextEPNS1_9StringValE",
+
"_ZN5doris12HllFunctions9hll_mergeEPN9doris_udf15FunctionContextERKNS1_9StringValEPS4_",
+
"_ZN5doris12HllFunctions9hll_mergeEPN9doris_udf15FunctionContextERKNS1_9StringValEPS4_",
+
"_ZN5doris12HllFunctions13hll_serializeEPN9doris_udf15FunctionContextERKNS1_9StringValE",
+
"_ZN5doris12HllFunctions13hll_serializeEPN9doris_udf15FunctionContextERKNS1_9StringValE",
+ true, false, true));
+
+ // HLL_RAW_AGG is alias of HLL_UNION
addBuiltin(AggregateFunction.createBuiltin("hll_raw_agg",
Lists.newArrayList(t), Type.HLL, Type.HLL,
"_ZN5doris12HllFunctions8hll_initEPN9doris_udf15FunctionContextEPNS1_9StringValE",
diff --git a/gensrc/script/doris_builtins_functions.py
b/gensrc/script/doris_builtins_functions.py
index 9516371..d9e1f6e 100755
--- a/gensrc/script/doris_builtins_functions.py
+++ b/gensrc/script/doris_builtins_functions.py
@@ -630,9 +630,9 @@ visible_functions = [
#hll function
[['hll_cardinality'], 'BIGINT', ['VARCHAR'],
'_ZN5doris12HllFunctions15hll_cardinalityEPN9doris_udf15FunctionContextERKNS1_9StringValE'],
- [['hll_hash'], 'VARCHAR', ['VARCHAR'],
+ [['hll_hash'], 'HLL', ['VARCHAR'],
'_ZN5doris12HllFunctions8hll_hashEPN9doris_udf15FunctionContextERKNS1_9StringValE'],
- [['hll_empty'], 'VARCHAR', [],
+ [['hll_empty'], 'HLL', [],
'_ZN5doris12HllFunctions9hll_emptyEPN9doris_udf15FunctionContextE'],
#bitmap function
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
