Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor code optimizations found with the profiler #4442

Open
wants to merge 8 commits into
base: v2.x
Choose a base branch
from
Open

Minor code optimizations found with the profiler #4442

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5703802
Minor optimizations found with profiler
renecannao Jan 25, 2024
78fd49e
Minor code optimization
renecannao Jan 25, 2024
1d11701
Minor code optimizations
renecannao Jan 25, 2024
725027b
Fixed optimization in previous commit
renecannao Jan 25, 2024
b757c97
Removed several assert() from MySQL_Variables in non-debug build
renecannao Jan 25, 2024
eba540a
Remove redundant code from MySQL_Session about charsets check
renecannao Jan 25, 2024
d6690e8
Code optimizations in verify_set_names()
renecannao Jan 25, 2024
6b8a542
Removed file created by mistake
renecannao Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove redundant code from MySQL_Session about charsets check
  • Loading branch information
@renecannao
renecannao committed Jan 25, 2024
commit eba540af7da16b312050cab4b003e3e54c7bc457
29 changes: 24 additions & 5 deletions lib/MySQL_Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5049,8 +5049,26 @@ int MySQL_Session::handler() {
goto handler_again;
}

/*
// Since all variables below SQL_NAME_LAST_LOW_WM
// are related to charset, this section of the code is
// redundant because verify_set_names() takes care of it.
bool SQL_NAME_LAST_LOW_WM_matches = true;
// this is a "fast" version of the extensive check that follows
for (auto i = 0; i < SQL_NAME_LAST_LOW_WM && SQL_NAME_LAST_LOW_WM_matches == true; i++) {
if (i == SQL_CHARACTER_ACTION) {
if (client_myconn->var_hash[i] != myconn->var_hash[i]) {
SQL_NAME_LAST_LOW_WM_matches = false;
}
}
}
if (SQL_NAME_LAST_LOW_WM_matches == false) {
for (auto i = 0; i < SQL_NAME_LAST_LOW_WM; i++) {
auto client_hash = client_myds->myconn->var_hash[i];
auto client_hash = client_myconn->var_hash[i];
if (i == SQL_CHARACTER_ACTION) {
// SQL_CHARACTER_ACTION has no meaning for the backend
continue;
}
#ifdef DEBUG
if (GloVars.global.gdbg) {
switch (i) {
Expand All @@ -5075,11 +5093,12 @@ int MySQL_Session::handler() {
}
}
}
MySQL_Connection *c_con = client_myds->myconn;
vector<uint32_t>::const_iterator it_c = c_con->dynamic_variables_idx.begin(); // client connection iterator
for ( ; it_c != c_con->dynamic_variables_idx.end() ; it_c++) {
}
*/
vector<uint32_t>::const_iterator it_c = client_myconn->dynamic_variables_idx.begin(); // client connection iterator
for ( ; it_c != client_myconn->dynamic_variables_idx.end() ; it_c++) {
auto i = *it_c;
auto client_hash = c_con->var_hash[i];
auto client_hash = client_myconn->var_hash[i];
auto server_hash = myconn->var_hash[i];
if (client_hash != server_hash) {
if(
Expand Down