Skip to content

Commit ee9085a

Browse files
ilya071294AlexPeshkoff
authored andcommitted
Excess conversion of sql statement to UTF8 is removed from fbtrace (#103)
1 parent dd49fa6 commit ee9085a

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

src/utilities/ntrace/TracePluginImpl.cpp

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,24 +1516,18 @@ void TracePluginImpl::register_sql_statement(ITraceSQLStatement* statement)
15161516
if (!sql_length)
15171517
return;
15181518

1519-
if (config.include_filter.hasData() || config.exclude_filter.hasData())
1519+
if (config.include_filter.hasData())
15201520
{
1521-
const char* sqlUtf8 = statement->getTextUTF8();
1522-
FB_SIZE_T utf8_length = fb_strlen(sqlUtf8);
1523-
1524-
if (config.include_filter.hasData())
1525-
{
1526-
include_matcher->reset();
1527-
include_matcher->process((const UCHAR*) sqlUtf8, utf8_length);
1528-
need_statement = include_matcher->result();
1529-
}
1521+
include_matcher->reset();
1522+
include_matcher->process((const UCHAR*)sql, sql_length);
1523+
need_statement = include_matcher->result();
1524+
}
15301525

1531-
if (need_statement && config.exclude_filter.hasData())
1532-
{
1533-
exclude_matcher->reset();
1534-
exclude_matcher->process((const UCHAR*) sqlUtf8, utf8_length);
1535-
need_statement = !exclude_matcher->result();
1536-
}
1526+
if (need_statement && config.exclude_filter.hasData())
1527+
{
1528+
exclude_matcher->reset();
1529+
exclude_matcher->process((const UCHAR*)sql, sql_length);
1530+
need_statement = !exclude_matcher->result();
15371531
}
15381532

15391533
if (need_statement)

0 commit comments

Comments
 (0)