Another try

dbms/src/Common/ErrorCodes.cpp

@@ -469,7 +469,6 @@ namespace ErrorCodes
     extern const int POCO_EXCEPTION = 1000;
     extern const int STD_EXCEPTION = 1001;
     extern const int UNKNOWN_EXCEPTION = 1002;
-    extern const int METRIKA_OTHER_ERROR = 1003;
 
     extern const int CONDITIONAL_TREE_PARENT_NOT_FOUND = 2001;
     extern const int ILLEGAL_PROJECTION_MANIPULATOR = 2002;

dbms/src/Databases/DatabaseLazy.cpp

@@ -359,10 +359,10 @@ StoragePtr DatabaseLazy::loadTable(const Context & context, const String & table
             return it->second.table = table;
         }
     }
-    catch (Exception & e)
+    catch (const Exception & e)
     {
-        e.addMessage("Cannot create table from metadata file " + table_metadata_path + ". Error: " + DB::getCurrentExceptionMessage(true));
-        throw;
+        throw Exception("Cannot create table from metadata file " + table_metadata_path + ". Error: " + DB::getCurrentExceptionMessage(true),
+                e, DB::ErrorCodes::CANNOT_CREATE_TABLE_FROM_METADATA);
     }
 }
 

dbms/src/Databases/DatabaseOrdinary.cpp

@@ -82,7 +82,7 @@ catch (const Exception & e)
 {
     throw Exception(
         "Cannot create object '" + query.table + "' from query " + serializeAST(query) + ". Error: " + DB::getCurrentExceptionMessage(true),
-        ErrorCodes::CANNOT_CREATE_TABLE_FROM_METADATA);
+        e, DB::ErrorCodes::CANNOT_CREATE_TABLE_FROM_METADATA);
 }
 
 
@@ -137,7 +137,7 @@ void DatabaseOrdinary::loadStoredObjects(
         catch (const Exception & e)
         {
             throw Exception(
-                "Cannot parse definition from metadata file " + full_path + ". Error: " + DB::getCurrentExceptionMessage(true), ErrorCodes::CANNOT_PARSE_TEXT);
+                "Cannot parse definition from metadata file " + full_path + ". Error: " + DB::getCurrentExceptionMessage(true), e, ErrorCodes::CANNOT_PARSE_TEXT);
         }
 
     });

dbms/src/Storages/tests/part_checker.cpp

@@ -18,7 +18,7 @@ Poco::Path getMarksFile(const std::string & part_path)
             return p;
         ++it;
     }
-    throw Exception("Cannot find any mark file in directory " + part_path, DB::ErrorCodes::METRIKA_OTHER_ERROR);
+    throw Exception("Cannot find any mark file in directory " + part_path, DB::ErrorCodes::POCO_EXCEPTION);
 }
 
 MergeTreeIndexGranularity readGranularity(const Poco::Path & mrk_file_path, size_t fixed_granularity)