You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by hu...@apache.org on 2025/10/31 04:46:47 UTC
(doris) 04/13: use slot->col_name_lower_case().
This is an automated email from the ASF dual-hosted git repository.
huajianlan pushed a commit to branch nested_column_prune
in repository https://gitbox.apache.org/repos/asf/doris.git
commit e038fb267de8c418c07dfdb14c7cb9a194a896df
Author: kakachen <ch...@selectdb.com>
AuthorDate: Tue Oct 28 21:20:36 2025 +0800
use slot->col_name_lower_case().
---
be/src/vec/exec/format/table/hive_reader.cpp | 16 ++++------------
be/src/vec/exec/format/table/iceberg_reader.cpp | 3 ---
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/be/src/vec/exec/format/table/hive_reader.cpp b/be/src/vec/exec/format/table/hive_reader.cpp
index 96ca2dff2d0..eea7a126517 100644
--- a/be/src/vec/exec/format/table/hive_reader.cpp
+++ b/be/src/vec/exec/format/table/hive_reader.cpp
@@ -53,7 +53,7 @@ Status HiveOrcReader::init_reader(
// hive1 / use index
std::map<std::string, const SlotDescriptor*> slot_map; // table_name to slot
for (const auto& slot : tuple_descriptor->slots()) {
- slot_map.emplace(slot->col_name(), slot);
+ slot_map.emplace(slot->col_name_lower_case(), slot);
}
// For top-level columns, use indexes to match, and for sub-columns, still use name to match columns.
@@ -161,7 +161,7 @@ ColumnIdResult HiveOrcReader::_create_column_ids(const orc::Type* orc_type,
};
for (const auto* slot : tuple_descriptor->slots()) {
- auto it = table_col_name_to_orc_type_map.find(slot->col_name());
+ auto it = table_col_name_to_orc_type_map.find(slot->col_name_lower_case());
if (it == table_col_name_to_orc_type_map.end()) {
// Column not found in file (e.g., partition column, added column)
continue;
@@ -318,7 +318,7 @@ Status HiveParquetReader::init_reader(
} else { // use idx
std::map<std::string, const SlotDescriptor*> slot_map; //table_name to slot
for (const auto& slot : tuple_descriptor->slots()) {
- slot_map.emplace(slot->col_name(), slot);
+ slot_map.emplace(slot->col_name_lower_case(), slot);
}
// For top-level columns, use indexes to match, and for sub-columns, still use name to match columns.
@@ -444,12 +444,8 @@ ColumnIdResult HiveParquetReader::_create_column_ids(const FieldDescriptor* fiel
};
for (const auto* slot : tuple_descriptor->slots()) {
- // if (slot->col_name().starts_with(BeConsts::GLOBAL_ROWID_COL)) {
- // continue;
- // }
-
// Find the field schema for this slot (may not exist for partition columns, etc.)
- auto it = table_col_name_to_field_schema_map.find(slot->col_name());
+ auto it = table_col_name_to_field_schema_map.find(slot->col_name_lower_case());
if (it == table_col_name_to_field_schema_map.end()) {
// Column not found in file (e.g., partition column, added column)
continue;
@@ -554,10 +550,6 @@ ColumnIdResult HiveParquetReader::_create_column_ids_by_top_level_col_index(
};
for (const auto* slot : tuple_descriptor->slots()) {
- // if (slot->col_name().starts_with(BeConsts::GLOBAL_ROWID_COL)) {
- // continue;
- // }
-
// Find the field schema for this slot (may not exist for partition columns, etc.)
auto it = table_col_pos_to_field_schema_map.find(slot->col_pos());
if (it == table_col_pos_to_field_schema_map.end()) {
diff --git a/be/src/vec/exec/format/table/iceberg_reader.cpp b/be/src/vec/exec/format/table/iceberg_reader.cpp
index 95aa41a43e6..9a9e984a9d9 100644
--- a/be/src/vec/exec/format/table/iceberg_reader.cpp
+++ b/be/src/vec/exec/format/table/iceberg_reader.cpp
@@ -539,9 +539,6 @@ ColumnIdResult IcebergParquetReader::_create_column_ids(const FieldDescriptor* f
};
for (const auto* slot : tuple_descriptor->slots()) {
- // if (slot->col_name().starts_with(BeConsts::GLOBAL_ROWID_COL)) {
- // continue;
- // }
auto it = iceberg_id_to_field_schema_map.find(slot->col_unique_id());
if (it == iceberg_id_to_field_schema_map.end()) {
// Column not found in file (e.g., partition column, added column)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org