mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Apply suggestions from code review
Co-authored-by: Antonio Andelic <antonio2368@users.noreply.github.com>
This commit is contained in:
parent
21e4b453df
commit
633b4a5dcf
@ -928,7 +928,7 @@ ColumnPtr makeNullableOrLowCardinalityNullableSafe(const ColumnPtr & column)
|
||||
return assert_cast<const ColumnLowCardinality &>(*column).cloneNullable();
|
||||
|
||||
if (column->canBeInsideNullable())
|
||||
return makeNullableSafe(column);
|
||||
return makeNullable(column);
|
||||
|
||||
return column;
|
||||
}
|
||||
|
@ -631,9 +631,9 @@ void ColumnVariant::popBack(size_t n)
|
||||
size_t size = local_discriminators_data.size();
|
||||
const size_t num_variants = variants.size();
|
||||
std::vector<size_t> nested_n(num_variants, 0);
|
||||
for (size_t i = 0; i != n; ++i)
|
||||
for (size_t i = size - n; i < size; ++i)
|
||||
{
|
||||
Discriminator discr = local_discriminators_data[size - i - 1];
|
||||
Discriminator discr = local_discriminators_data[i];
|
||||
if (discr != NULL_DISCRIMINATOR)
|
||||
++nested_n[discr];
|
||||
}
|
||||
@ -966,7 +966,7 @@ ColumnPtr ColumnVariant::replicate(const Offsets & replicate_offsets) const
|
||||
{
|
||||
new_offsets_data.reserve(new_size);
|
||||
for (size_t i = old_size; i < new_size; ++i)
|
||||
new_offsets_data.push_back(new_offsets_data[i - 1] + 1);
|
||||
new_offsets_data.push_back(i);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1260,6 +1260,8 @@ std::optional<ColumnVariant::Discriminator> ColumnVariant::getLocalDiscriminator
|
||||
{
|
||||
if (variants[i]->size() == local_discriminators->size())
|
||||
return i;
|
||||
if (!variants[i]->empty())
|
||||
return std::nullopt
|
||||
}
|
||||
|
||||
return std::nullopt;
|
||||
|
@ -205,7 +205,7 @@ public:
|
||||
|
||||
void compareColumn(const IColumn &, size_t, PaddedPODArray<UInt64> *, PaddedPODArray<Int8> &, int, int) const override
|
||||
{
|
||||
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method compareColumn is not supported for ColumnAggregateFunction");
|
||||
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method compareColumn is not supported for ColumnVariant");
|
||||
}
|
||||
|
||||
bool hasEqualValues() const override;
|
||||
|
@ -85,9 +85,7 @@ bool EnumValues<T>::tryGetValue(T & x, StringRef field_name, bool try_treat_as_i
|
||||
if (try_treat_as_id)
|
||||
{
|
||||
ReadBufferFromMemory tmp_buf(field_name.data, field_name.size);
|
||||
if (!tryReadText(x, tmp_buf) || !tmp_buf.eof() || !value_to_name_map.contains(x))
|
||||
return false;
|
||||
return true;
|
||||
return tryReadText(x, tmp_buf) && tmp_buf.eof() && value_to_name_map.contains(x);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user