Correction for passing zero-length SQL to trace#8745
Merged
dyemanov merged 2 commits intoFirebirdSQL:masterfrom Oct 7, 2025
Merged
Correction for passing zero-length SQL to trace#8745dyemanov merged 2 commits intoFirebirdSQL:masterfrom
dyemanov merged 2 commits intoFirebirdSQL:masterfrom
Conversation
Member
|
I'm OK with the correction for master, but I'm not sure we can backport |
dyemanov
approved these changes
Sep 21, 2025
Contributor
Author
Done: #8748 |
asfernandes
reviewed
Sep 22, 2025
| static const char empty_string[] = ""; | ||
| if (!string) | ||
| static constexpr std::string_view empty_string = "<empty statement>"; | ||
| if (m_string == nullptr || (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0)) |
Member
There was a problem hiding this comment.
IMO this if wih attribution of m_string_len is very confusing.
Contributor
Author
There was a problem hiding this comment.
Is this option suitable (more code, but cleaner execution):
diff --git a/src/jrd/trace/TraceDSQLHelpers.h b/src/jrd/trace/TraceDSQLHelpers.h
index c8c2a230bf..a47d5aacca 100644
--- a/src/jrd/trace/TraceDSQLHelpers.h
+++ b/src/jrd/trace/TraceDSQLHelpers.h
@@ -55,11 +55,17 @@ public:
m_start_clock = fb_utils::query_performance_counter();
- static constexpr std::string_view empty_string = "<empty statement>";
- if (m_string == nullptr || (m_string_len == 0 && (m_string_len = fb_strlen(m_string)) == 0))
+ if (m_string == nullptr)
{
- m_string = empty_string.data();
- m_string_len = empty_string.length();
+ traceEmptyStatement();
+ }
+ else
+ {
+ if (m_string_len == 0)
+ m_string_len = fb_strlen(m_string);
+
+ if (m_string_len == 0)
+ traceEmptyStatement();
}
}
@@ -105,6 +111,13 @@ public:
}
private:
+ void traceEmptyStatement()
+ {
+ static constexpr std::string_view empty_string = "<empty statement>";
+ m_string = empty_string.data();
+ m_string_len = empty_string.length();
+ }
+
bool m_need_trace;
Attachment* m_attachment;
jrd_tra* const m_transaction;
Member
There was a problem hiding this comment.
What about this:
if (m_string == nullptr)
traceEmptyStatement();
else if (m_string_len == 0)
{
m_string_len = fb_strlen(m_string);
if (m_string_len == 0)
traceEmptyStatement();
}
Contributor
Author
There was a problem hiding this comment.
Looks good. I applied these changes.
dyemanov
approved these changes
Oct 7, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Postfix for #8738