Merge pull request #54481 from ucasfl/hints

Refactor IHints

src/Client/ClientBase.h

@@ -63,7 +63,7 @@ void interruptSignalHandler(int signum);
 class InternalTextLogs;
 class WriteBufferFromFileDescriptor;
 
-class ClientBase : public Poco::Util::Application, public IHints<2, ClientBase>
+class ClientBase : public Poco::Util::Application, public IHints<2>
 {
 
 public:

src/Common/IFactoryWithAliases.h

@@ -20,7 +20,7 @@ namespace ErrorCodes
   * template parameter is available as Value
   */
 template <typename ValueType>
-class IFactoryWithAliases : public IHints<2, IFactoryWithAliases<ValueType>>
+class IFactoryWithAliases : public IHints<2>
 {
 protected:
     using Value = ValueType;

src/Common/NamePrompter.h

@@ -95,7 +95,7 @@ String getHintsErrorMessageSuffix(const std::vector<String> & hints);
 
 void appendHintsMessage(String & error_message, const std::vector<String> & hints);
 
-template <size_t MaxNumHints, typename Self>
+template <size_t MaxNumHints = 1>
 class IHints
 {
 public:

src/Core/Settings.h

@@ -1073,7 +1073,7 @@ DECLARE_SETTINGS_TRAITS_ALLOW_CUSTOM_SETTINGS(SettingsTraits, LIST_OF_SETTINGS)
 /** Settings of query execution.
   * These settings go to users.xml.
   */
-struct Settings : public BaseSettings<SettingsTraits>, public IHints<2, Settings>
+struct Settings : public BaseSettings<SettingsTraits>, public IHints<2>
 {
     Settings() = default;
 

src/DataTypes/EnumValues.h

@@ -13,7 +13,7 @@ namespace ErrorCodes
 }
 
 template <typename T>
-class EnumValues : public IHints<1, EnumValues<T>>
+class EnumValues : public IHints<>
 {
 public:
     using Value = std::pair<std::string, T>;

src/Functions/UserDefined/UserDefinedSQLFunctionFactory.h

@@ -15,7 +15,7 @@ class BackupEntriesCollector;
 class RestorerFromBackup;
 
 /// Factory for SQLUserDefinedFunctions
-class UserDefinedSQLFunctionFactory : public IHints<1, UserDefinedSQLFunctionFactory>
+class UserDefinedSQLFunctionFactory : public IHints<>
 {
 public:
     static UserDefinedSQLFunctionFactory & instance();

src/Interpreters/DatabaseCatalog.cpp

@@ -61,7 +61,7 @@ namespace ErrorCodes
     extern const int UNFINISHED;
 }
 
-class DatabaseNameHints : public IHints<1, DatabaseNameHints>
+class DatabaseNameHints : public IHints<>
 {
 public:
     explicit DatabaseNameHints(const DatabaseCatalog & database_catalog_)

src/Interpreters/DatabaseCatalog.h

@@ -30,7 +30,7 @@ namespace fs = std::filesystem;
 namespace DB
 {
 
-class TableNameHints : public IHints<1, TableNameHints>
+class TableNameHints : public IHints<>
 {
 public:
     TableNameHints(ConstDatabasePtr database_, ContextPtr context_)

src/Server/HTTPPathHints.h

@@ -7,7 +7,7 @@
 namespace DB
 {
 
-class HTTPPathHints : public IHints<1, HTTPPathHints>
+class HTTPPathHints : public IHints<>
 {
 public:
     std::vector<String> getAllRegisteredNames() const override;

src/Storages/ColumnsDescription.h

@@ -98,7 +98,7 @@ struct ColumnDescription
 
 
 /// Description of multiple table columns (in CREATE TABLE for example).
-class ColumnsDescription : public IHints<1, ColumnsDescription>
+class ColumnsDescription : public IHints<>
 {
 public:
     ColumnsDescription() = default;

src/Storages/IStorage.h

@@ -91,7 +91,7 @@ using IndexSize = ColumnSize;
   * - data storage structure (compression, etc.)
   * - concurrent access to data (locks, etc.)
   */
-class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromotion<IStorage>, public IHints<1, IStorage>
+class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromotion<IStorage>, public IHints<>
 {
 public:
     IStorage() = delete;

src/Storages/IndicesDescription.h

@@ -62,7 +62,7 @@ struct IndexDescription
 };
 
 /// All secondary indices in storage
-struct IndicesDescription : public std::vector<IndexDescription>, IHints<1, IndicesDescription>
+struct IndicesDescription : public std::vector<IndexDescription>, IHints<>
 {
     /// Index with name exists
     bool has(const String & name) const;

src/Storages/ProjectionsDescription.h

@@ -106,7 +106,7 @@ struct ProjectionDescription
 using ProjectionDescriptionRawPtr = const ProjectionDescription *;
 
 /// All projections in storage
-struct ProjectionsDescription : public IHints<1, ProjectionsDescription>
+struct ProjectionsDescription : public IHints<>
 {
     ProjectionsDescription() = default;
     ProjectionsDescription(ProjectionsDescription && other) = default;

src/Storages/StorageFactory.h

@@ -22,7 +22,7 @@ struct StorageID;
   * In 'columns' Nested data structures must be flattened.
   * You should subsequently call IStorage::startup method to work with table.
   */
-class StorageFactory : private boost::noncopyable, public IHints<1, StorageFactory>
+class StorageFactory : private boost::noncopyable, public IHints<>
 {
 public: