thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Alexey Milovidov 2020-07-31 15:25:17 +03:00
parent 9c9ef0db9b
commit 6d5590a4b4
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Dictionaries/PolygonDictionaryImplementations.cpp
View File

@ -18,22 +18,20 @@ namespace ErrorCodes
} }
PolygonDictionarySimple::PolygonDictionarySimple( PolygonDictionarySimple::PolygonDictionarySimple(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
const DictionaryLifetime dict_lifetime_, const DictionaryLifetime dict_lifetime_,
InputType input_type_, InputType input_type_,
PointType point_type_): PointType point_type_):
IPolygonDictionary(database_, name_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_) IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_)
{ {
} }
std::shared_ptr<const IExternalLoadable> PolygonDictionarySimple::clone() const std::shared_ptr<const IExternalLoadable> PolygonDictionarySimple::clone() const
{ {
return std::make_shared<PolygonDictionarySimple>( return std::make_shared<PolygonDictionarySimple>(
this->database, this->getDictionaryID(),
this->name,
this->dict_struct, this->dict_struct,
this->source_ptr->clone(), this->source_ptr->clone(),
this->dict_lifetime, this->dict_lifetime,
@ -57,8 +55,7 @@ bool PolygonDictionarySimple::find(const Point & point, size_t & id) const
} }
PolygonDictionaryIndexEach::PolygonDictionaryIndexEach( PolygonDictionaryIndexEach::PolygonDictionaryIndexEach(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
const DictionaryLifetime dict_lifetime_, const DictionaryLifetime dict_lifetime_,
@ -66,7 +63,7 @@ PolygonDictionaryIndexEach::PolygonDictionaryIndexEach(
PointType point_type_, PointType point_type_,
int min_intersections_, int min_intersections_,
int max_depth_) int max_depth_)
: IPolygonDictionary(database_, name_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_), : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_),
grid(min_intersections_, max_depth_, polygons), grid(min_intersections_, max_depth_, polygons),
min_intersections(min_intersections_), min_intersections(min_intersections_),
max_depth(max_depth_) max_depth(max_depth_)
@ -83,8 +80,7 @@ PolygonDictionaryIndexEach::PolygonDictionaryIndexEach(
std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexEach::clone() const std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexEach::clone() const
{ {
return std::make_shared<PolygonDictionaryIndexEach>( return std::make_shared<PolygonDictionaryIndexEach>(
this->database, this->getDictionaryID(),
this->name,
this->dict_struct, this->dict_struct,
this->source_ptr->clone(), this->source_ptr->clone(),
this->dict_lifetime, this->dict_lifetime,
@ -118,8 +114,7 @@ bool PolygonDictionaryIndexEach::find(const Point & point, size_t & id) const
} }
PolygonDictionaryIndexCell::PolygonDictionaryIndexCell( PolygonDictionaryIndexCell::PolygonDictionaryIndexCell(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
const DictionaryLifetime dict_lifetime_, const DictionaryLifetime dict_lifetime_,
@ -127,7 +122,7 @@ PolygonDictionaryIndexCell::PolygonDictionaryIndexCell(
PointType point_type_, PointType point_type_,
size_t min_intersections_, size_t min_intersections_,
size_t max_depth_) size_t max_depth_)
: IPolygonDictionary(database_, name_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_), : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_),
index(min_intersections_, max_depth_, polygons), index(min_intersections_, max_depth_, polygons),
min_intersections(min_intersections_), min_intersections(min_intersections_),
max_depth(max_depth_) max_depth(max_depth_)
@ -137,8 +132,7 @@ PolygonDictionaryIndexCell::PolygonDictionaryIndexCell(
std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexCell::clone() const std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexCell::clone() const
{ {
return std::make_shared<PolygonDictionaryIndexCell>( return std::make_shared<PolygonDictionaryIndexCell>(
this->database, this->getDictionaryID(),
this->name,
this->dict_struct, this->dict_struct,
this->source_ptr->clone(), this->source_ptr->clone(),
this->dict_lifetime, this->dict_lifetime,
@ -228,6 +222,8 @@ DictionaryPtr createLayout(const std::string & ,
const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"}; const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
if constexpr (std::is_same_v<PolygonDictionary, PolygonDictionaryIndexEach> || std::is_same_v<PolygonDictionary, PolygonDictionaryIndexCell>) if constexpr (std::is_same_v<PolygonDictionary, PolygonDictionaryIndexEach> || std::is_same_v<PolygonDictionary, PolygonDictionaryIndexCell>)
{ {
const auto & layout_prefix = config_prefix + ".layout"; const auto & layout_prefix = config_prefix + ".layout";
@ -236,10 +232,10 @@ DictionaryPtr createLayout(const std::string & ,
const auto & dict_prefix = layout_prefix + "." + keys.front(); const auto & dict_prefix = layout_prefix + "." + keys.front();
size_t max_depth = config.getUInt(dict_prefix + ".max_depth", PolygonDictionary::kMaxDepthDefault); size_t max_depth = config.getUInt(dict_prefix + ".max_depth", PolygonDictionary::kMaxDepthDefault);
size_t min_intersections = config.getUInt(dict_prefix + ".min_intersections", PolygonDictionary::kMinIntersectionsDefault); size_t min_intersections = config.getUInt(dict_prefix + ".min_intersections", PolygonDictionary::kMinIntersectionsDefault);
return std::make_unique<PolygonDictionary>(database, name, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type, min_intersections, max_depth); return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type, min_intersections, max_depth);
} }
else else
return std::make_unique<PolygonDictionary>(database, name, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type); return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type);
} }
void registerDictionaryPolygon(DictionaryFactory & factory) void registerDictionaryPolygon(DictionaryFactory & factory)

9
src/Dictionaries/PolygonDictionaryImplementations.h
View File

@ -17,8 +17,7 @@ class PolygonDictionarySimple : public IPolygonDictionary
{ {
public: public:
PolygonDictionarySimple( PolygonDictionarySimple(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
DictionaryLifetime dict_lifetime_, DictionaryLifetime dict_lifetime_,
@ -41,8 +40,7 @@ class PolygonDictionaryIndexEach : public IPolygonDictionary
{ {
public: public:
PolygonDictionaryIndexEach( PolygonDictionaryIndexEach(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
DictionaryLifetime dict_lifetime_, DictionaryLifetime dict_lifetime_,
@ -71,8 +69,7 @@ class PolygonDictionaryIndexCell : public IPolygonDictionary
{ {
public: public:
PolygonDictionaryIndexCell( PolygonDictionaryIndexCell(
const std::string & database_, const StorageID & dict_id_,
const std::string & name_,
const DictionaryStructure & dict_struct_, const DictionaryStructure & dict_struct_,
DictionarySourcePtr source_ptr_, DictionarySourcePtr source_ptr_,
DictionaryLifetime dict_lifetime_, DictionaryLifetime dict_lifetime_,