Merge pull request ClickHouse#80225 from ClickHouse/pass_dict_name_to_source

tavplubix · web-flow · commit 7b78f5887cba · 2025-05-14T21:09:28.000Z
Pass dictionary name to DictionarySource
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -18,7 +18,8 @@ namespace ErrorCodes
 
 void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+    auto create_table_source = [=]([[maybe_unused]] const String & name,
+                                   [[maybe_unused]] const DictionaryStructure & dict_struct,
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -215,7 +215,8 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
 
 void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -99,7 +99,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     {
         const auto & create_source = found->second;
         auto sample_block = createSampleBlock(dict_struct);
-        return create_source(dict_struct, config, config_prefix, sample_block, global_context, default_database, check_config);
+        return create_source(name, dict_struct, config, config_prefix, sample_block, global_context, default_database, check_config);
     }
 
     throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
diff --git a/src/Dictionaries/DictionarySourceFactory.h b/src/Dictionaries/DictionarySourceFactory.h
@@ -32,6 +32,7 @@ class DictionarySourceFactory : private boost::noncopyable
     /// It is used as default_database for ClickHouse dictionary source when no explicit database was specified.
     /// Does not make sense for other sources.
     using Creator = std::function<DictionarySourcePtr(
+        const String & name,
         const DictionaryStructure & dict_struct,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -215,7 +215,8 @@ std::string ExecutableDictionarySource::toString() const
 
 void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -187,7 +187,8 @@ std::string ExecutablePoolDictionarySource::toString() const
 
 void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
@@ -72,7 +72,8 @@ Poco::Timestamp FileDictionarySource::getLastModification() const
 
 void registerDictionarySourceFile(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                     const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -206,7 +206,8 @@ std::string HTTPDictionarySource::toString() const
 
 void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                   const DictionaryStructure & dict_struct,
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -176,7 +176,8 @@ String LibraryDictionarySource::getDictAttributesString()
 
 void registerDictionarySourceLibrary(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -35,7 +35,7 @@ namespace ErrorCodes
 void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 {
     #if USE_MONGODB
-    auto create_dictionary_source = [](
+    auto create_dictionary_source = [](const String & /*name*/,
         const DictionaryStructure & dict_struct,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & root_config_prefix,
@@ -99,7 +99,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         return std::make_unique<MongoDBDictionarySource>(dict_struct, std::move(configuration), std::move(sample_block));
     };
     #else
-    auto create_dictionary_source = [](
+    auto create_dictionary_source = [](const String & /*name*/,
         const DictionaryStructure & /* dict_struct */,
         const Poco::Util::AbstractConfiguration & /* config */,
         const std::string & /* root_config_prefix */,
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -67,7 +67,8 @@ static const ValidateKeysMultiset<ExternalDatabaseEqualKeysSet> dictionary_allow
 
 void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                   [[maybe_unused]] const DictionaryStructure & dict_struct,
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
diff --git a/src/Dictionaries/NullDictionarySource.cpp b/src/Dictionaries/NullDictionarySource.cpp
@@ -34,7 +34,8 @@ std::string NullDictionarySource::toString() const
 void registerDictionarySourceNull(DictionarySourceFactory & factory)
 {
     auto create_table_source
-        = [=](const DictionaryStructure & /* dict_struct */,
+        = [=](const String & /*name*/,
+              const DictionaryStructure & /* dict_struct */,
               const Poco::Util::AbstractConfiguration & /* config */,
               const std::string & /* config_prefix */,
               Block & sample_block,
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -163,7 +163,7 @@ bool PolygonDictionaryIndexCell::find(const Point & point, size_t & polygon_inde
 }
 
 template <class PolygonDictionary>
-DictionaryPtr createLayout(const std::string & ,
+DictionaryPtr createLayout(const std::string & /*name*/,
                            const DictionaryStructure & dict_struct,
                            const Poco::Util::AbstractConfiguration & config,
                            const std::string & config_prefix,
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -203,7 +203,8 @@ static void validateConfigKeys(
 
 void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
@@ -23,7 +23,8 @@ namespace DB
 
     void registerDictionarySourceRedis(DictionarySourceFactory & factory)
     {
-        auto create_table_source = [=](const DictionaryStructure & dict_struct,
+        auto create_table_source = [=](const String & /*name*/,
+                                    const DictionaryStructure & dict_struct,
                                     const Poco::Util::AbstractConfiguration & config,
                                     const String & config_prefix,
                                     Block & sample_block,
diff --git a/src/Dictionaries/RegExpTreeDictionary.cpp b/src/Dictionaries/RegExpTreeDictionary.cpp
@@ -976,7 +976,7 @@ Columns RegExpTreeDictionary::getColumnsImpl(
 
 void registerDictionaryRegExpTree(DictionaryFactory & factory)
 {
-    auto create_layout = [=](const std::string &,
+    auto create_layout = [=](const std::string & /*name*/,
                              const DictionaryStructure & dict_struct,
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -238,7 +238,8 @@ QueryPipeline XDBCDictionarySource::loadFromQuery(const Poco::URI & uri, const B
 
 void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
+    auto create_table_source = [=](const String & /*name*/,
+                                   const DictionaryStructure & dict_struct,
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
@@ -278,7 +279,8 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 
 void registerDictionarySourceJDBC(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & /* dict_struct */,
+    auto create_table_source = [=](const String & /*name*/,
+                                 const DictionaryStructure & /* dict_struct */,
                                  const Poco::Util::AbstractConfiguration & /* config */,
                                  const std::string & /* config_prefix */,
                                  Block & /* sample_block */,
diff --git a/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp b/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
@@ -64,7 +64,8 @@ namespace ErrorCodes
 
 void registerDictionarySourceYAMLRegExpTree(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+    auto create_table_source = [=]([[maybe_unused]] const String & name,
+                                   [[maybe_unused]] const DictionaryStructure & dict_struct,
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const String & config_prefix,
                                    Block & ,

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ namespace ErrorCodes`
`18`	`18`
`19`	`19`	`void registerDictionarySourceCassandra(DictionarySourceFactory & factory)`
`20`	`20`	`{`
`21`		`- auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,`
	`21`	`+ auto create_table_source = [=]([[maybe_unused]] const String & name,`
	`22`	`+ [[maybe_unused]] const DictionaryStructure & dict_struct,`
`22`	`23`	`[[maybe_unused]] const Poco::Util::AbstractConfiguration & config,`
`23`	`24`	`[[maybe_unused]] const std::string & config_prefix,`
`24`	`25`	`[[maybe_unused]] Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re`
`215`	`215`
`216`	`216`	`void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)`
`217`	`217`	`{`
`218`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`218`	`+ auto create_table_source = [=](const String & /name/,`
	`219`	`+ const DictionaryStructure & dict_struct,`
`219`	`220`	`const Poco::Util::AbstractConfiguration & config,`
`220`	`221`	`const std::string & config_prefix,`
`221`	`222`	`Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ DictionarySourcePtr DictionarySourceFactory::create(`
`99`	`99`	`{`
`100`	`100`	`const auto & create_source = found->second;`
`101`	`101`	`auto sample_block = createSampleBlock(dict_struct);`
`102`		`- return create_source(dict_struct, config, config_prefix, sample_block, global_context, default_database, check_config);`
	`102`	`+ return create_source(name, dict_struct, config, config_prefix, sample_block, global_context, default_database, check_config);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ std::string ExecutableDictionarySource::toString() const`
`215`	`215`
`216`	`216`	`void registerDictionarySourceExecutable(DictionarySourceFactory & factory)`
`217`	`217`	`{`
`218`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`218`	`+ auto create_table_source = [=](const String & /name/,`
	`219`	`+ const DictionaryStructure & dict_struct,`
`219`	`220`	`const Poco::Util::AbstractConfiguration & config,`
`220`	`221`	`const std::string & config_prefix,`
`221`	`222`	`Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ std::string ExecutablePoolDictionarySource::toString() const`
`187`	`187`
`188`	`188`	`void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)`
`189`	`189`	`{`
`190`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`190`	`+ auto create_table_source = [=](const String & /name/,`
	`191`	`+ const DictionaryStructure & dict_struct,`
`191`	`192`	`const Poco::Util::AbstractConfiguration & config,`
`192`	`193`	`const std::string & config_prefix,`
`193`	`194`	`Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ Poco::Timestamp FileDictionarySource::getLastModification() const`
`72`	`72`
`73`	`73`	`void registerDictionarySourceFile(DictionarySourceFactory & factory)`
`74`	`74`	`{`
`75`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`75`	`+ auto create_table_source = [=](const String & /name/,`
	`76`	`+ const DictionaryStructure & dict_struct,`
`76`	`77`	`const Poco::Util::AbstractConfiguration & config,`
`77`	`78`	`const std::string & config_prefix,`
`78`	`79`	`Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ std::string HTTPDictionarySource::toString() const`
`206`	`206`
`207`	`207`	`void registerDictionarySourceHTTP(DictionarySourceFactory & factory)`
`208`	`208`	`{`
`209`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`209`	`+ auto create_table_source = [=](const String & /name/,`
	`210`	`+ const DictionaryStructure & dict_struct,`
`210`	`211`	`const Poco::Util::AbstractConfiguration & config,`
`211`	`212`	`const std::string & config_prefix,`
`212`	`213`	`Block & sample_block,`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,8 @@ String LibraryDictionarySource::getDictAttributesString()`
`176`	`176`
`177`	`177`	`void registerDictionarySourceLibrary(DictionarySourceFactory & factory)`
`178`	`178`	`{`
`179`		`- auto create_table_source = [=](const DictionaryStructure & dict_struct,`
	`179`	`+ auto create_table_source = [=](const String & /name/,`
	`180`	`+ const DictionaryStructure & dict_struct,`
`180`	`181`	`const Poco::Util::AbstractConfiguration & config,`
`181`	`182`	`const std::string & config_prefix,`
`182`	`183`	`Block & sample_block,`