This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 6120c1b7de [fix](hll) incorrect implementation of
hll_union/hll_union_agg with nullable arguments (#19287)
6120c1b7de is described below
commit 6120c1b7de88412b4b2311ed165cfcde53b4b374
Author: Jerry Hu <mrh...@gmail.com>
AuthorDate: Fri May 5 10:59:07 2023 +0800
[fix](hll) incorrect implementation of hll_union/hll_union_agg with
nullable arguments (#19287)
---
be/src/vec/aggregate_functions/aggregate_function_hll_union_agg.cpp | 5 ++---
be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/be/src/vec/aggregate_functions/aggregate_function_hll_union_agg.cpp
b/be/src/vec/aggregate_functions/aggregate_function_hll_union_agg.cpp
index 1d9219c704..5541a5b739 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_hll_union_agg.cpp
+++ b/be/src/vec/aggregate_functions/aggregate_function_hll_union_agg.cpp
@@ -48,11 +48,10 @@ AggregateFunctionPtr
create_aggregate_function_HLL_union(const std::string& name
}
void register_aggregate_function_HLL_union_agg(AggregateFunctionSimpleFactory&
factory) {
+ /// Here do not register nullable functions,
`register_aggregate_function_combinator_null`
+ /// will do such things.
factory.register_function("hll_union_agg",
create_aggregate_function_HLL_union_agg<false>);
- factory.register_function("hll_union_agg",
create_aggregate_function_HLL_union_agg<true>, true);
-
factory.register_function("hll_union",
create_aggregate_function_HLL_union<false>);
- factory.register_function("hll_union",
create_aggregate_function_HLL_union<true>, true);
factory.register_alias("hll_union", "hll_raw_agg");
}
diff --git
a/be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp
b/be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp
index 5a94e64e2f..a6e70fd6ac 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp
+++ b/be/src/vec/aggregate_functions/aggregate_function_simple_factory.cpp
@@ -84,6 +84,7 @@ AggregateFunctionSimpleFactory&
AggregateFunctionSimpleFactory::instance() {
register_aggregate_function_collect_list(instance);
register_aggregate_function_sequence_match(instance);
register_aggregate_function_avg_weighted(instance);
+ register_aggregate_function_HLL_union_agg(instance);
// if you only register function with no nullable, and wants to add
nullable automatically, you should place function above this line
register_aggregate_function_combinator_null(instance);
@@ -91,7 +92,6 @@ AggregateFunctionSimpleFactory&
AggregateFunctionSimpleFactory::instance() {
register_aggregate_function_stddev_variance_samp(instance);
register_aggregate_function_replace_reader_load(instance);
register_aggregate_function_window_lead_lag_first_last(instance);
- register_aggregate_function_HLL_union_agg(instance);
register_aggregate_function_percentile_approx(instance);
});
return instance;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
