Merge pull request #6036 from vitlibar/remove-unnecessary-try-catch

Remove unnecessary try catch

dbms/src/Dictionaries/CacheDictionary.h

@@ -30,8 +30,6 @@ public:
         const DictionaryLifetime dict_lifetime,
         const size_t size);
 
-    std::exception_ptr getCreationException() const override { return {}; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "Cache"; }
@@ -62,8 +60,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
@@ -284,8 +280,6 @@ private:
     mutable std::atomic<size_t> element_count{0};
     mutable std::atomic<size_t> hit_count{0};
     mutable std::atomic<size_t> query_count{0};
-
-    const std::chrono::time_point<std::chrono::system_clock> creation_time = std::chrono::system_clock::now();
 };
 
 }

dbms/src/Dictionaries/ComplexKeyCacheDictionary.h

@@ -50,8 +50,6 @@ public:
 
     std::string getKeyDescription() const { return key_description; }
 
-    std::exception_ptr getCreationException() const override { return {}; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "ComplexKeyCache"; }
@@ -86,8 +84,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;

dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp

@@ -29,18 +29,8 @@ ComplexKeyHashedDictionary::ComplexKeyHashedDictionary(
     , saved_block{std::move(saved_block)}
 {
     createAttributes();
-
-    try
-    {
     loadData();
     calculateBytesAllocated();
-    }
-    catch (...)
-    {
-        creation_exception = std::current_exception();
-    }
-
-    creation_time = std::chrono::system_clock::now();
 }
 
 #define DECLARE(TYPE) \

dbms/src/Dictionaries/ComplexKeyHashedDictionary.h

@@ -32,8 +32,6 @@ public:
 
     std::string getKeyDescription() const { return key_description; }
 
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "ComplexKeyHashed"; }
@@ -61,8 +59,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
@@ -255,10 +251,6 @@ private:
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
-    std::chrono::time_point<std::chrono::system_clock> creation_time;
-
-    std::exception_ptr creation_exception;
-
     BlockPtr saved_block;
 };
 

dbms/src/Dictionaries/FlatDictionary.cpp

@@ -36,18 +36,8 @@ FlatDictionary::FlatDictionary(
     , saved_block{std::move(saved_block)}
 {
     createAttributes();
-
-    try
-    {
     loadData();
     calculateBytesAllocated();
-    }
-    catch (...)
-    {
-        creation_exception = std::current_exception();
-    }
-
-    creation_time = std::chrono::system_clock::now();
 }
 
 

dbms/src/Dictionaries/FlatDictionary.h

@@ -29,8 +29,6 @@ public:
         bool require_nonempty,
         BlockPtr saved_block = nullptr);
 
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "Flat"; }
@@ -58,8 +56,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
@@ -244,10 +240,6 @@ private:
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
-    std::chrono::time_point<std::chrono::system_clock> creation_time;
-
-    std::exception_ptr creation_exception;
-
     BlockPtr saved_block;
 };
 

dbms/src/Dictionaries/HashedDictionary.cpp

@@ -30,18 +30,8 @@ HashedDictionary::HashedDictionary(
     , saved_block{std::move(saved_block)}
 {
     createAttributes();
-
-    try
-    {
     loadData();
     calculateBytesAllocated();
-    }
-    catch (...)
-    {
-        creation_exception = std::current_exception();
-    }
-
-    creation_time = std::chrono::system_clock::now();
 }
 
 

dbms/src/Dictionaries/HashedDictionary.h

@@ -28,8 +28,6 @@ public:
         bool require_nonempty,
         BlockPtr saved_block = nullptr);
 
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "Hashed"; }
@@ -57,8 +55,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
@@ -248,10 +244,6 @@ private:
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
 
-    std::chrono::time_point<std::chrono::system_clock> creation_time;
-
-    std::exception_ptr creation_exception;
-
     BlockPtr saved_block;
 };
 

dbms/src/Dictionaries/RangeHashedDictionary.cpp

@@ -80,18 +80,8 @@ RangeHashedDictionary::RangeHashedDictionary(
     , require_nonempty(require_nonempty)
 {
     createAttributes();
-
-    try
-    {
     loadData();
     calculateBytesAllocated();
-    }
-    catch (...)
-    {
-        creation_exception = std::current_exception();
-    }
-
-    creation_time = std::chrono::system_clock::now();
 }
 
 

dbms/src/Dictionaries/RangeHashedDictionary.h

@@ -24,8 +24,6 @@ public:
         const DictionaryLifetime dict_lifetime,
         bool require_nonempty);
 
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
     std::string getName() const override { return dictionary_name; }
 
     std::string getTypeName() const override { return "RangeHashed"; }
@@ -53,8 +51,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
@@ -227,10 +223,6 @@ private:
     size_t element_count = 0;
     size_t bucket_count = 0;
     mutable std::atomic<size_t> query_count{0};
-
-    std::chrono::time_point<std::chrono::system_clock> creation_time;
-
-    std::exception_ptr creation_exception;
 };
 
 }

dbms/src/Dictionaries/TrieDictionary.h

@@ -33,8 +33,6 @@ public:
 
     std::string getKeyDescription() const { return key_description; }
 
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
     std::string getName() const override { return name; }
 
     std::string getTypeName() const override { return "Trie"; }
@@ -62,8 +60,6 @@ public:
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-
     bool isInjective(const std::string & attribute_name) const override
     {
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;

dbms/src/Interpreters/CatBoostModel.cpp

@@ -504,20 +504,6 @@ std::shared_ptr<CatBoostLibHolder> getCatBoostWrapperHolder(const std::string &
 CatBoostModel::CatBoostModel(std::string name_, std::string model_path_, std::string lib_path_,
                              const ExternalLoadableLifetime & lifetime)
     : name(std::move(name_)), model_path(std::move(model_path_)), lib_path(std::move(lib_path_)), lifetime(lifetime)
-{
-    try
-    {
-        init();
-    }
-    catch (...)
-    {
-        creation_exception = std::current_exception();
-    }
-
-    creation_time = std::chrono::system_clock::now();
-}
-
-void CatBoostModel::init()
 {
     api_provider = getCatBoostWrapperHolder(lib_path);
     api = &api_provider->getAPI();

dbms/src/Interpreters/CatBoostModel.h

@@ -68,9 +68,6 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override;
 
-    std::chrono::time_point<std::chrono::system_clock> getCreationTime() const override { return creation_time; }
-    std::exception_ptr getCreationException() const override { return creation_exception; }
-
 private:
     std::string name;
     std::string model_path;
@@ -85,9 +82,6 @@ private:
     size_t cat_features_count;
     size_t tree_count;
 
-    std::chrono::time_point<std::chrono::system_clock> creation_time;
-    std::exception_ptr creation_exception;
-
     void init();
 };
 

dbms/src/Interpreters/ExternalLoader.cpp

@@ -219,7 +219,7 @@ class ExternalLoader::LoadingDispatcher : private boost::noncopyable
 {
 public:
     /// Called to load or reload an object.
-    using CreateObjectFunction = std::function<ObjectWithException(
+    using CreateObjectFunction = std::function<LoadablePtr(
         const String & /* name */, const ObjectConfig & /* config */, bool config_changed, const LoadablePtr & /* previous_version */)>;
 
     /// Called after loading/reloading an object to calculate the time of the next update.
@@ -783,7 +783,7 @@ private:
         std::exception_ptr new_exception;
         try
         {
-            std::tie(new_object, new_exception) = create_object(name, config, config_changed, previous_version);
+            new_object = create_object(name, config, config_changed, previous_version);
         }
         catch (...)
         {
@@ -792,8 +792,6 @@ private:
 
         if (!new_object && !new_exception)
             throw Exception("No object created and no exception raised for " + type_name, ErrorCodes::LOGICAL_ERROR);
-        if (new_object && new_exception)
-            new_object = nullptr;
 
         /// Calculate a new update time.
         TimePoint next_update_time;
@@ -1152,17 +1150,13 @@ void ExternalLoader::reload(bool load_never_loading)
     loading_dispatcher->reload(load_never_loading);
 }
 
-ExternalLoader::ObjectWithException ExternalLoader::createObject(
+ExternalLoader::LoadablePtr ExternalLoader::createObject(
     const String & name, const ObjectConfig & config, bool config_changed, const LoadablePtr & previous_version) const
 {
     if (previous_version && !config_changed)
-    {
-        auto new_object = previous_version->clone();
-        return {new_object, new_object->getCreationException()};
-    }
+        return previous_version->clone();
 
-    auto new_object = create(name, *config.config, config.key_in_config);
-    return {new_object, new_object->getCreationException()};
+    return create(name, *config.config, config.key_in_config);
 }
 
 ExternalLoader::TimePoint ExternalLoader::calculateNextUpdateTime(const LoadablePtr & loaded_object, size_t error_count) const

dbms/src/Interpreters/ExternalLoader.h

@@ -186,10 +186,8 @@ protected:
 
 private:
     struct ObjectConfig;
-    using ObjectWithException = std::pair<LoadablePtr, std::exception_ptr>;
 
-    ObjectWithException
-    createObject(const String & name, const ObjectConfig & config, bool config_changed, const LoadablePtr & previous_version) const;
+    LoadablePtr createObject(const String & name, const ObjectConfig & config, bool config_changed, const LoadablePtr & previous_version) const;
     TimePoint calculateNextUpdateTime(const LoadablePtr & loaded_object, size_t error_count) const;
 
     class ConfigFilesReader;

dbms/src/Interpreters/IExternalLoadable.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <chrono>
 #include <string>
 #include <memory>
 #include <boost/noncopyable.hpp>
@@ -41,10 +40,6 @@ public:
     virtual bool isModified() const = 0;
     /// Returns new object with the same configuration. Is used to update modified object when lifetime exceeded.
     virtual std::shared_ptr<const IExternalLoadable> clone() const = 0;
-
-    virtual std::chrono::time_point<std::chrono::system_clock> getCreationTime() const = 0;
-
-    virtual std::exception_ptr getCreationException() const = 0;
 };
 
 }