You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ya...@apache.org on 2022/10/26 06:27:43 UTC
[doris] branch master updated: [Bugfix](bitmap) Fix to_bitmap_with_check function symbol is incorrect (#13667)
This is an automated email from the ASF dual-hosted git repository.
yangzhg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 65aa863dcf [Bugfix](bitmap) Fix to_bitmap_with_check function symbol is incorrect (#13667)
65aa863dcf is described below
commit 65aa863dcfe5c808fe5c6fd28f2ed2ed3e8f3d40
Author: Zhengguo Yang <ya...@gmail.com>
AuthorDate: Wed Oct 26 14:27:38 2022 +0800
[Bugfix](bitmap) Fix to_bitmap_with_check function symbol is incorrect (#13667)
* [Bugfix](bitmap) Fix to_bitmap_with_check function symbol is incorrect
---
be/src/exprs/bitmap_function.cpp | 2 +-
be/src/vec/exec/vunion_node.cpp | 4 +++-
gensrc/script/doris_builtins_functions.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/be/src/exprs/bitmap_function.cpp b/be/src/exprs/bitmap_function.cpp
index 1d4fc4df47..7254dc3a45 100644
--- a/be/src/exprs/bitmap_function.cpp
+++ b/be/src/exprs/bitmap_function.cpp
@@ -190,7 +190,7 @@ StringVal BitmapFunctions::to_bitmap_with_check(doris_udf::FunctionContext* ctx,
"18446744073709551615 currently, cannot load negative values to column with"
" to_bitmap MV on it.";
ctx->set_error(ss.str().c_str());
- return StringVal::null();
+ return serialize(ctx, nullptr);
}
}
diff --git a/be/src/vec/exec/vunion_node.cpp b/be/src/vec/exec/vunion_node.cpp
index 0bf6b2f826..e3343e25de 100644
--- a/be/src/vec/exec/vunion_node.cpp
+++ b/be/src/vec/exec/vunion_node.cpp
@@ -197,7 +197,9 @@ Status VUnionNode::get_next_const(RuntimeState* state, Block* block) {
&result_list[i]));
}
tmp_block.erase_not_in(result_list);
- mblock.merge(tmp_block);
+ if (tmp_block.rows() > 0) {
+ mblock.merge(tmp_block);
+ }
}
if (!mem_reuse) {
diff --git a/gensrc/script/doris_builtins_functions.py b/gensrc/script/doris_builtins_functions.py
index 4715372acf..5c14145853 100755
--- a/gensrc/script/doris_builtins_functions.py
+++ b/gensrc/script/doris_builtins_functions.py
@@ -2478,7 +2478,7 @@ visible_functions = [
'_ZN5doris15BitmapFunctions9to_bitmapEPN9doris_udf15FunctionContextERKNS1_9StringValE',
'', '', 'vec', 'ALWAYS_NOT_NULLABLE'],
[['to_bitmap_with_check'], 'BITMAP', ['STRING'],
- '_ZN5doris15BitmapFunctions9to_bitmapEPN9doris_udf15FunctionContextERKNS1_9StringValE',
+ '_ZN5doris15BitmapFunctions20to_bitmap_with_checkEPN9doris_udf15FunctionContextERKNS1_9StringValE',
'', '', 'vec', 'ALWAYS_NOT_NULLABLE'],
[['bitmap_hash'], 'BITMAP', ['STRING'],
'_ZN5doris15BitmapFunctions11bitmap_hash64EPN9doris_udf15FunctionContextERKNS1_9StringValE',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org