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

More compilation errors

Browse Source
This commit is contained in:
achulkov2 2019-12-16 18:34:46 +03:00
parent 3f7fba6a78
commit e9d2a1a8ad
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Dictionaries/PolygonDictionary.cpp
View File

@ -27,6 +27,8 @@ IPolygonDictionary::IPolygonDictionary(
, source_ptr(std::move(source_ptr_))
, dict_lifetime(dict_lifetime_)
{
createAttributes();
loadData();
}
std::string IPolygonDictionary::getName() const
@ -132,7 +134,7 @@ void IPolygonDictionary::calculateBytesAllocated()
}
void IPolygonDictionary::has(const Columns &key_columns, const DataTypes &key_types, PaddedPODArray<UInt8> &out) {
void IPolygonDictionary::has(const Columns &key_columns, const DataTypes &key_types, PaddedPODArray<UInt8> &out) const {
// TODO: Use constant in error message?
if (key_types.size() != DIM)
throw Exception{"Expected two columns of coordinates", ErrorCodes::BAD_ARGUMENTS};
@ -228,8 +230,6 @@ std::shared_ptr<const IExternalLoadable> SimplePolygonDictionary::clone() const
this->dict_lifetime);
}
void SimplePolygonDictionary::generate() {}
bool SimplePolygonDictionary::find(const Point &point, size_t & id) const
{
for (size_t i = 0; i < (this->polygons).size(); ++i)

4
dbms/src/Dictionaries/PolygonDictionary.h
View File

@ -50,7 +50,7 @@ public:
BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
// TODO: Refactor design to perform stronger checks, i.e. make this an override.
void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) ;
void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
protected:
using Point = bg::model::point<Float64, 2, bg::cs::cartesian>;
@ -59,7 +59,6 @@ protected:
std::vector<MultiPolygon> polygons;
virtual void generate() = 0;
virtual bool find(const Point & point, size_t & id) const = 0;
const std::string name;
@ -101,7 +100,6 @@ public:
std::shared_ptr<const IExternalLoadable> clone() const override;
private:
void generate() override;
bool find(const Point & point, size_t & id) const override;
};