From be0ea1b6374baec4b91b2b95a168a3661cb7d41c Mon Sep 17 00:00:00 2001 From: Kseniia Sumarokova <54203879+kssenii@users.noreply.github.com> Date: Fri, 26 Sep 2025 12:24:00 +0000 Subject: [PATCH] Merge pull request #87621 from arthurpassos/do_not_put_hive_columns_in_format_header Move 03631_hive_columns_not_in_format_header.sql to the proper file location --- src/Storages/HivePartitioningUtils.cpp | 3 ++- .../0_stateless/03203_hive_style_partitioning.reference | 2 +- .../03631_hive_columns_not_in_format_header.reference | 0 .../0_stateless/03631_hive_columns_not_in_format_header.sql | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename 03631_hive_columns_not_in_format_header.reference => tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference (100%) rename 03631_hive_columns_not_in_format_header.sql => tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql (100%) diff --git a/src/Storages/HivePartitioningUtils.cpp b/src/Storages/HivePartitioningUtils.cpp index 04fd801681d9..0a4333054bdd 100644 --- a/src/Storages/HivePartitioningUtils.cpp +++ b/src/Storages/HivePartitioningUtils.cpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace DB { @@ -85,7 +86,7 @@ NamesAndTypesList extractHivePartitionColumnsFromPath( { if (const auto type = tryInferDataTypeByEscapingRule(value, format_settings ? *format_settings : getFormatSettings(context), FormatSettings::EscapingRule::Raw)) { - if (type->canBeInsideLowCardinality()) + if (type->canBeInsideLowCardinality() && isStringOrFixedString(type)) { hive_partition_columns_to_read_from_file_path.emplace_back(key, std::make_shared(type)); } diff --git a/tests/queries/0_stateless/03203_hive_style_partitioning.reference b/tests/queries/0_stateless/03203_hive_style_partitioning.reference index a481cf0a28f1..85afdea228d2 100644 --- a/tests/queries/0_stateless/03203_hive_style_partitioning.reference +++ b/tests/queries/0_stateless/03203_hive_style_partitioning.reference @@ -31,7 +31,7 @@ Elizabeth Delgado Elizabeth Cross 42 2020-01-01 [1,2,3] 42.42 -Array(Int64) LowCardinality(Float64) +Array(Int64) Float64 101 2071 2071 diff --git a/03631_hive_columns_not_in_format_header.reference b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference similarity index 100% rename from 03631_hive_columns_not_in_format_header.reference rename to tests/queries/0_stateless/03631_hive_columns_not_in_format_header.reference diff --git a/03631_hive_columns_not_in_format_header.sql b/tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql similarity index 100% rename from 03631_hive_columns_not_in_format_header.sql rename to tests/queries/0_stateless/03631_hive_columns_not_in_format_header.sql