You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/27 04:24:46 UTC
[doris] branch master updated: [fix] need materialize condition conlumn in if function (#11229)
This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 6933f5e328 [fix] need materialize condition conlumn in if function (#11229)
6933f5e328 is described below
commit 6933f5e3288dc919d2003d706cea53c105fac075
Author: starocean999 <40...@users.noreply.github.com>
AuthorDate: Wed Jul 27 12:24:41 2022 +0800
[fix] need materialize condition conlumn in if function (#11229)
---
be/src/vec/functions/if.cpp | 5 ++++-
.../conditional_functions/test_conditional_function.out | 3 +++
.../conditional_functions/test_conditional_function.groovy | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/be/src/vec/functions/if.cpp b/be/src/vec/functions/if.cpp
index cf9a56ddcc..0de81cd7c7 100644
--- a/be/src/vec/functions/if.cpp
+++ b/be/src/vec/functions/if.cpp
@@ -428,7 +428,6 @@ public:
Status execute_impl(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result, size_t input_rows_count) override {
- const ColumnWithTypeAndName& arg_cond = block.get_by_position(arguments[0]);
const ColumnWithTypeAndName& arg_then = block.get_by_position(arguments[1]);
const ColumnWithTypeAndName& arg_else = block.get_by_position(arguments[2]);
@@ -439,6 +438,10 @@ public:
return Status::OK();
}
+ ColumnWithTypeAndName& cond_column = block.get_by_position(arguments[0]);
+ cond_column.column = materialize_column_if_const(cond_column.column);
+ const ColumnWithTypeAndName& arg_cond = block.get_by_position(arguments[0]);
+
Status ret = Status::OK();
if (execute_for_null_condition(context, block, arg_cond, arg_then, arg_else, result) ||
execute_for_null_then_else(context, block, arg_cond, arg_then, arg_else, result,
diff --git a/regression-test/data/query/sql_functions/conditional_functions/test_conditional_function.out b/regression-test/data/query/sql_functions/conditional_functions/test_conditional_function.out
index 760b515996..b246850ec3 100644
--- a/regression-test/data/query/sql_functions/conditional_functions/test_conditional_function.out
+++ b/regression-test/data/query/sql_functions/conditional_functions/test_conditional_function.out
@@ -38,3 +38,6 @@
-- !sql --
1
+-- !sql --
+9999-07-31
+
diff --git a/regression-test/suites/query/sql_functions/conditional_functions/test_conditional_function.groovy b/regression-test/suites/query/sql_functions/conditional_functions/test_conditional_function.groovy
index 3859d71b95..5aed14012e 100644
--- a/regression-test/suites/query/sql_functions/conditional_functions/test_conditional_function.groovy
+++ b/regression-test/suites/query/sql_functions/conditional_functions/test_conditional_function.groovy
@@ -49,4 +49,8 @@ suite("test_conditional_function", "query") {
qt_sql "select nullif(1,1);"
qt_sql "select nullif(1,0);"
+ qt_sql """select if(date_format(CONCAT_WS('', '9999-07', '-26'), '%Y-%m')= DATE_FORMAT( curdate(), '%Y-%m'),
+ curdate(),
+ DATE_FORMAT(DATE_SUB(month_ceil ( CONCAT_WS('', '9999-07', '-26')), 1), '%Y-%m-%d'));"""
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org