Feature/error messages as string views #13455
Merged
Conversation
This file contains hidden or 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
…b/arangodb into feature/small-result-with-external-error
…om:arangodb/arangodb into feature/small-result-with-external-error
…om:arangodb/arangodb into feature/small-result-with-external-error
…om:arangodb/arangodb into feature/small-result-with-external-error
…b/arangodb into feature/refactor-error-message-string-view
…om:arangodb/arangodb into feature/small-result-with-external-error
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
…ll-result-with-external-error
…:arangodb/arangodb into feature/error-messages-as-string-views
|
|
maierlars
suggested changes
Feb 8, 2021
arangod/Aql/QueryWarnings.cpp
Outdated
| @@ -53,6 +53,10 @@ void QueryWarnings::registerWarning(int code, std::string const& details) { | |||
| registerWarning(code, details.c_str()); | |||
| } | |||
|
|
|||
| void QueryWarnings::registerWarning(int code, std::string_view details) { | |||
| registerWarning(code, details.data()); | |||
There was a problem hiding this comment.
I don't know if registerWarning expects the string to be null-terminated but data from a string is not necessarily null-terminated.
| @@ -176,7 +181,7 @@ void Parser::registerParseError(int errorCode, char const* data, int line, int c | |||
| } | |||
|
|
|||
| /// @brief register a warning | |||
| void Parser::registerWarning(int errorCode, char const* data, int line, int column) { | |||
| void Parser::registerWarning(int errorCode, std::string_view data, int line, int column) { | |||
| // ignore line and column for now | |||
| _query.warnings().registerWarning(errorCode, data); | |||
There was a problem hiding this comment.
is data null-terminated?
arangod/Aql/Parser.cpp
Outdated
| @@ -144,6 +144,11 @@ void Parser::registerParseError(int errorCode, char const* format, | |||
| return registerParseError(errorCode, buffer, line, column); | |||
| } | |||
|
|
|||
| void Parser::registerParseError(int errorCode, std::string_view format, | |||
| char const* data, int line, int column) { | |||
| return registerParseError(errorCode, format.data(), data, line, column); | |||
There was a problem hiding this comment.
data() is not null-terminated in general.
…or-messages-as-string-views
…or-messages-as-string-views
maierlars
approved these changes
Feb 10, 2021
|
|
…or-messages-as-string-views
8ea6619 to
7463f85
Compare
maierlars
approved these changes
Feb 11, 2021
elfringham
pushed a commit
to elfringham/arangodb
that referenced
this pull request
Apr 20, 2021
Co-authored-by: Jan <jsteemann@users.noreply.github.com>
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.
Scope & Purpose
As the length of error messages (as returned by
TRI_errno_string) is known at compile time, it makes sense to save and return them asstd::string_views instead ofchar const*.Enterprise companion PR: https://github.com/arangodb/enterprise/pull/641
Backports:
Testing & Verification
(Please pick either of the following options)