thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
avogar 2024-05-22 15:53:32 +00:00
parent e53daf32a1
commit 48cab9e9db
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Columns/ColumnDynamic.cpp
View File

@ -9,7 +9,7 @@
#include <Common/SipHash.h> #include <Common/SipHash.h>
#include <Processors/Transforms/ColumnGathererTransform.h> #include <Processors/Transforms/ColumnGathererTransform.h>
#include <Interpreters/castColumn.h> #include <Interpreters/castColumn.h>
#include <Common/logger_useful.h>
namespace DB namespace DB
{ {
@ -662,8 +662,8 @@ void ColumnDynamic::takeDynamicStructureFromSourceColumns(const Columns & source
all_variants.push_back(source_variants[i]); all_variants.push_back(source_variants[i]);
it = total_sizes.emplace(variant_name, 0).first; it = total_sizes.emplace(variant_name, 0).first;
} }
auto statistics_it = source_statistics.data.find(variant_name);
size_t size = source_statistics.data.empty() ? source_variant_column.getVariantByGlobalDiscriminator(i).size() : source_statistics.data.at(variant_name); size_t size = statistics_it == source_statistics.data.end() ? source_variant_column.getVariantByGlobalDiscriminator(i).size() : statistics_it->second;
it->second += size; it->second += size;
} }
} }

6
src/Columns/ColumnDynamic.h
View File

@ -96,13 +96,13 @@ public:
MutableColumnPtr cloneEmpty() const override MutableColumnPtr cloneEmpty() const override
{ {
/// Keep current dynamic structure but not statistics. /// Keep current dynamic structure
return Base::create(variant_column->cloneEmpty(), variant_info, max_dynamic_types); return Base::create(variant_column->cloneEmpty(), variant_info, max_dynamic_types, statistics);
} }
MutableColumnPtr cloneResized(size_t size) const override MutableColumnPtr cloneResized(size_t size) const override
{ {
return Base::create(variant_column->cloneResized(size), variant_info, max_dynamic_types); return Base::create(variant_column->cloneResized(size), variant_info, max_dynamic_types, statistics);
} }
size_t size() const override size_t size() const override