You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/12/29 04:37:36 UTC
[doris] 05/05: [fix](multi catalog)Set column defualt value for query. (#15415)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit be513e1062efca1988a26f21339a643b42032742
Author: Jibing-Li <64...@users.noreply.github.com>
AuthorDate: Thu Dec 29 12:03:17 2022 +0800
[fix](multi catalog)Set column defualt value for query. (#15415)
Current column default value is used only for load task. But in the case of Iceberg schema change,
query task is also possible to read the default value for columns not exist in old schema.
This pr is to support default value for query task.
Manually tested the broker load and external emr regression cases.
---
be/src/vec/exec/scan/vfile_scanner.cpp | 39 +++++++++++++++++-----------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/be/src/vec/exec/scan/vfile_scanner.cpp b/be/src/vec/exec/scan/vfile_scanner.cpp
index 8599029cf3..e675583bd3 100644
--- a/be/src/vec/exec/scan/vfile_scanner.cpp
+++ b/be/src/vec/exec/scan/vfile_scanner.cpp
@@ -654,8 +654,27 @@ Status VFileScanner::_init_expr_ctxes() {
}
}
+ // set column name to default value expr map
+ for (auto slot_desc : _real_tuple_desc->slots()) {
+ if (!slot_desc->is_materialized()) {
+ continue;
+ }
+ vectorized::VExprContext* ctx = nullptr;
+ auto it = _params.default_value_of_src_slot.find(slot_desc->id());
+ if (it != std::end(_params.default_value_of_src_slot)) {
+ if (!it->second.nodes.empty()) {
+ RETURN_IF_ERROR(
+ vectorized::VExpr::create_expr_tree(_state->obj_pool(), it->second, &ctx));
+ RETURN_IF_ERROR(ctx->prepare(_state, *_default_val_row_desc));
+ RETURN_IF_ERROR(ctx->open(_state));
+ }
+ // if expr is empty, the default value will be null
+ _col_default_value_ctx.emplace(slot_desc->col_name(), ctx);
+ }
+ }
+
if (_is_load) {
- // follow desc expr map and src default value expr map is only for load task.
+ // follow desc expr map is only for load task.
bool has_slot_id_map = _params.__isset.dest_sid_to_src_sid_without_trans;
int idx = 0;
for (auto slot_desc : _output_tuple_desc->slots()) {
@@ -694,24 +713,6 @@ Status VFileScanner::_init_expr_ctxes() {
}
}
}
-
- for (auto slot_desc : _real_tuple_desc->slots()) {
- if (!slot_desc->is_materialized()) {
- continue;
- }
- vectorized::VExprContext* ctx = nullptr;
- auto it = _params.default_value_of_src_slot.find(slot_desc->id());
- if (it != std::end(_params.default_value_of_src_slot)) {
- if (!it->second.nodes.empty()) {
- RETURN_IF_ERROR(vectorized::VExpr::create_expr_tree(_state->obj_pool(),
- it->second, &ctx));
- RETURN_IF_ERROR(ctx->prepare(_state, *_default_val_row_desc));
- RETURN_IF_ERROR(ctx->open(_state));
- }
- // if expr is empty, the default value will be null
- _col_default_value_ctx.emplace(slot_desc->col_name(), ctx);
- }
- }
}
return Status::OK();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org