Skip to content

Modify hll_hash function return type to HLL #3656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imay merged 2 commits into from
May 24, 2020
Merged

Modify hll_hash function return type to HLL #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aed67ca
modify hll function return type
HangyuanLiu May 21, 2020
bbc8580
Merge branch 'master' of https://github.com/apache/incubator-doris in…
HangyuanLiu May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fe/src/main/cup/sql_parser.cup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion fe/src/main/java/org/apache/doris/catalog/FunctionSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,17 @@ private void initAggregateBuiltins() {
"_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",
Expand Down
4 changes: 2 additions & 2 deletions gensrc/script/doris_builtins_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,9 @@
#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
Expand Down