thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 10:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix special builds

Browse Source
This commit is contained in:
avogar 2024-08-10 11:21:28 +00:00
parent 805a2e33bf
commit d243feea21
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Columns/ColumnDynamic.cpp
View File

@ -325,7 +325,7 @@ void ColumnDynamic::doInsertFrom(const IColumn & src_, size_t n)
/// Check if we insert from shared variant and process it separately.
if (src_global_discr == dynamic_src.getSharedVariantDiscriminator())
{
auto & src_shared_variant = dynamic_src.getSharedVariant();
const auto & src_shared_variant = dynamic_src.getSharedVariant();
auto value = src_shared_variant.getDataAt(src_offset);
/// Decode data type of this value.
ReadBufferFromMemory buf(value.data, value.size);
@ -469,9 +469,9 @@ void ColumnDynamic::doInsertRangeFrom(const IColumn & src_, size_t start, size_t
if (variant_info.variant_names.size() - 1 == max_dynamic_types)
{
auto shared_variant_discr = getSharedVariantDiscriminator();
for (size_t i = 0; i != dynamic_src.variant_info.variant_names.size(); ++i)
for (const auto & variant_name : dynamic_src.variant_info.variant_names)
{
auto it = variant_info.variant_name_to_discriminator.find(dynamic_src.variant_info.variant_names[i]);
auto it = variant_info.variant_name_to_discriminator.find(variant_name);
if (it == variant_info.variant_name_to_discriminator.end())
other_to_new_discriminators.push_back(shared_variant_discr);
else
@ -618,7 +618,7 @@ void ColumnDynamic::doInsertManyFrom(const IColumn & src_, size_t position, size
/// Check if we insert from shared variant and process it separately.
if (src_global_discr == dynamic_src.getSharedVariantDiscriminator())
{
auto & src_shared_variant = dynamic_src.getSharedVariant();
const auto & src_shared_variant = dynamic_src.getSharedVariant();
auto value = src_shared_variant.getDataAt(src_offset);
/// Decode data type of this value.
ReadBufferFromMemory buf(value.data, value.size);

2
src/Columns/ColumnDynamic.h
View File

@ -37,7 +37,7 @@ public:
MERGE, /// Statistics were calculated during merge of several MergeTree parts.
};
Statistics(Source source_) : source(source_) {}
explicit Statistics(Source source_) : source(source_) {}
/// Source of the statistics.
Source source;

2
src/Columns/ColumnVariant.cpp
View File

@ -476,7 +476,7 @@ void ColumnVariant::insertFromImpl(const DB::IColumn & src_, size_t n, const std
}
}
void ColumnVariant::insertRangeFromImpl(const DB::IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, Discriminator * skip_discriminator)
void ColumnVariant::insertRangeFromImpl(const DB::IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, const Discriminator * skip_discriminator)
{
const size_t num_variants = variants.size();
const auto & src = assert_cast<const ColumnVariant &>(src_);

2
src/Columns/ColumnVariant.h
View File

@ -329,7 +329,7 @@ public:
private:
void insertFromImpl(const IColumn & src_, size_t n, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
void insertRangeFromImpl(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, Discriminator * skip_discriminator);
void insertRangeFromImpl(const IColumn & src_, size_t start, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping, const Discriminator * skip_discriminator);
void insertManyFromImpl(const IColumn & src_, size_t position, size_t length, const std::vector<ColumnVariant::Discriminator> * global_discriminators_mapping);
void initIdentityGlobalToLocalDiscriminatorsMapping();