The rest of PR #7897 about improvement of exception message #7936
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stavrolia
changed the title
dbms/src/Databases/DatabaseLazy.cpp
Outdated
| @@ -361,8 +361,7 @@ StoragePtr DatabaseLazy::loadTable(const Context & context, const String & table | |||
| } | |||
| catch (const Exception & e) | |||
| { | |||
| throw Exception("Cannot create table from metadata file " + table_metadata_path + ", error: " + e.displayText() + | |||
| ", stack trace:\n" + e.getStackTrace().toString(), | |||
| throw Exception("Cannot create table from metadata file " + table_metadata_path + ", error: " + e.displayText() + DB::getCurrentExceptionMessage(true), | |||
There was a problem hiding this comment.
If I remember correctly, getCurrentExceptionMessage already includes displayText.
dbms/src/Databases/DatabaseLazy.cpp
Outdated
| @@ -361,8 +361,7 @@ StoragePtr DatabaseLazy::loadTable(const Context & context, const String & table | |||
| } | |||
| catch (const Exception & e) | |||
| { | |||
| throw Exception("Cannot create table from metadata file " + table_metadata_path + ", error: " + e.displayText() + | |||
| ", stack trace:\n" + e.getStackTrace().toString(), | |||
| throw Exception("Cannot create table from metadata file " + table_metadata_path + ", error: " + e.displayText() + DB::getCurrentExceptionMessage(true), | |||
There was a problem hiding this comment.
The context of exception is lost.
We must:
- catch by non-const reference and call
e.addMessageandthrow(rethrow current exception) to save the stack trace.
There was a problem hiding this comment.
(this was a small mistake by @nikvas0 that passed review unnoticed)
There was a problem hiding this comment.
But do we want to preserve the CANNOT_CREATE_TABLE_FROM_METADATA?
Perhaps it's better to pass original exception to this ctor, such we have both correct error code and the better stack trace
There was a problem hiding this comment.
Yes, it can be better.
There was a problem hiding this comment.
But it's not necessary.
| @@ -81,8 +81,7 @@ try | |||
| catch (const Exception & e) | |||
| { | |||
| throw Exception( | |||
| "Cannot create object '" + query.table + "' from query " + serializeAST(query) + ", error: " + e.displayText() + ", stack trace:\n" | |||
| + e.getStackTrace().toString(), | |||
| "Cannot create object '" + query.table + "' from query " + serializeAST(query) + ". Error: " + DB::getCurrentExceptionMessage(true), | |||
There was a problem hiding this comment.
Exception context is lost.
| @@ -138,8 +137,7 @@ void DatabaseOrdinary::loadStoredObjects( | |||
| catch (const Exception & e) | |||
| { | |||
| throw Exception( | |||
| "Cannot parse definition from metadata file " + full_path + ", error: " + e.displayText() + ", stack trace:\n" | |||
| + e.getStackTrace().toString(), ErrorCodes::CANNOT_PARSE_TEXT); | |||
| "Cannot parse definition from metadata file " + full_path + ". Error: " + DB::getCurrentExceptionMessage(true), ErrorCodes::CANNOT_PARSE_TEXT); | |||
There was a problem hiding this comment.
Exception context is lost.
alexey-milovidov
approved these changes
Nov 28, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Changelog category (leave one):