This is an automated email from the ASF dual-hosted git repository.
mrhhsg pushed a commit to branch nested_column_prune
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/nested_column_prune by this
push:
new 069223bdb39 fix case error in BE
069223bdb39 is described below
commit 069223bdb392734a400ec15616b899a96e067e95
Author: Hu Shenggang <[email protected]>
AuthorDate: Wed Oct 29 16:23:58 2025 +0800
fix case error in BE
---
be/src/olap/rowset/segment_v2/column_reader.cpp | 4 ++--
be/src/vec/functions/function.cpp | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp
b/be/src/olap/rowset/segment_v2/column_reader.cpp
index e900e8aaa49..44277fc92fd 100644
--- a/be/src/olap/rowset/segment_v2/column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/column_reader.cpp
@@ -936,7 +936,7 @@ Result<TColumnAccessPaths>
ColumnIterator::_get_sub_access_paths(
Status::InternalError("Invalid access path for struct
column: path is empty"));
}
- if (name_path.data_access_path.path[0] != _column_name) {
+ if (!StringCaseEqual()(name_path.data_access_path.path[0],
_column_name)) {
return ResultError(Status::InternalError(
R"(Invalid access path for column: expected name "{}", got
"{}")", _column_name,
name_path.data_access_path.path[0]));
@@ -1330,7 +1330,7 @@ Status StructFileColumnIterator::set_access_paths(
if (!no_predicate_sub_column) {
for (const auto& paths : sub_predicate_access_paths) {
- if (paths.data_access_path.path[0] == name) {
+ if (!StringCaseEqual()(paths.data_access_path.path[0], name)) {
sub_predicate_access_paths_of_this.emplace_back(paths);
}
}
diff --git a/be/src/vec/functions/function.cpp
b/be/src/vec/functions/function.cpp
index 17ce7b846ee..77b2b05612d 100644
--- a/be/src/vec/functions/function.cpp
+++ b/be/src/vec/functions/function.cpp
@@ -279,6 +279,9 @@ DataTypePtr FunctionBuilderImpl::get_return_type(const
ColumnsWithTypeAndName& a
create_block_with_nested_columns(Block(arguments),
numbers, false);
auto return_type = get_return_type_impl(
ColumnsWithTypeAndName(nested_block.begin(),
nested_block.end()));
+ if (!return_type) {
+ return nullptr;
+ }
return make_nullable(return_type);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
