Fixed compiler errors after rebase.

This commit is contained in:
Vitaliy Lyudvichenko 2017-02-17 21:19:06 +03:00 committed by alexey-milovidov
parent 1572cf39fb
commit 453ab0423c

View File

@ -26,6 +26,22 @@ public:
bool isConst() const override { return true; } bool isConst() const override { return true; }
virtual ColumnPtr convertToFullColumn() const = 0; virtual ColumnPtr convertToFullColumn() const = 0;
ColumnPtr convertToFullColumnIfConst() const override { return convertToFullColumn(); } ColumnPtr convertToFullColumnIfConst() const override { return convertToFullColumn(); }
Columns scatter(ColumnIndex num_columns, const Selector & selector) const override
{
if (size() != selector.size())
throw Exception("Size of selector doesn't match size of column.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
std::vector<size_t> counts(num_columns);
for (auto idx : selector)
++counts[idx];
Columns res(num_columns);
for (size_t i = 0; i < num_columns; ++i)
res[i] = cloneResized(counts[i]);
return res;
}
}; };
@ -158,22 +174,6 @@ public:
return std::make_shared<Derived>(replicated_size, data, data_type); return std::make_shared<Derived>(replicated_size, data, data_type);
} }
Columns scatter(ColumnIndex num_columns, const Selector & selector) const override
{
if (s != selector.size())
throw Exception("Size of selector doesn't match size of column.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
std::vector<size_t> counts(num_columns);
for (auto idx : selector)
++counts[idx];
Columns res(num_columns);
for (size_t i = 0; i < num_columns; ++i)
res[i] = cloneResized(counts[i]);
return res;
}
size_t byteSize() const override { return sizeof(data) + sizeof(s); } size_t byteSize() const override { return sizeof(data) + sizeof(s); }
size_t allocatedSize() const override { return byteSize(); } size_t allocatedSize() const override { return byteSize(); }