Skip to content

bind_hash_mapping sampling logging changes w.r.t. longer corrid #422

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

Open
vineravi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bind_hash_mapping sampling logging changes w.r.t. longer corrid #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions worker/cppworker/worker/OCCChild.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,11 +1056,27 @@ int OCCChild::handle_command(const int _cmd, std::string &_line)
{
if (config->is_switch_enabled("enable_bind_hash_logging", false)) {
bool skip = false;
if (m_corr_id.length() > 16) { // Max hex value that can be stored in ULLONG_MAX (FFFFFFFFFFFFFFFF)
if (m_corr_id.length() > 16 && m_corr_id.length() != 32) { // Max hex value that can be stored in ULLONG_MAX (FFFFFFFFFFFFFFFF); corrid.length() != 32 checked to handle new corrid with length 32
skip = true; // Reduce the logging noise.
}
if (!skip) {
unsigned long long int corrid = strtoull(m_corr_id.c_str(), NULL , 16);
unsigned long long int corrid;
unsigned long long int corrIdMsbVal;
unsigned long long int corrIdLsbVal;
bool longCorrId = false;
std::string corrIdMsb;
std::string corrIdLsb;

if (m_corr_id.length() == 32) {
longCorrId = true;
corrIdMsb = m_corr_id.substr(0, 16); // First 16 digits (Most Significant)
corrIdLsb = m_corr_id.substr(16, 16); // Last 16 digits (Least Significant)
Copy link
Copy Markdown
Collaborator

@ishi-0987 ishi-0987 Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last 16 digits .. Please check the start and end indexes for substr.

corrIdMsbVal = strtoull(corrIdMsb.c_str(), NULL, 16);
corrIdLsbVal = strtoull(corrIdLsb.c_str(), NULL, 16);
} else {
corrid = strtoull(m_corr_id.c_str(), NULL , 16);
}

if (errno == ERANGE) {
std::ostringstream msg;
msg << "m_err=error on strtoull(), errno=" << errno;
Expand All @@ -1072,7 +1088,7 @@ int OCCChild::handle_command(const int _cmd, std::string &_line)
e_name.AddData("corr_id_", m_corr_id);
e_name.Completed();
}
if (!skip && (bit_mask == (corrid & bit_mask))) { // Allow
if (!skip && ((longCorrId && (bit_mask == (corrIdMsbVal & bit_mask)) && (bit_mask == (corrIdLsbVal & bit_mask))) || (!longCorrId && bit_mask == (corrid & bit_mask)))) { // Allow
if (bind_array->size() > 0) {
// Skip SQL with large number of binds
if (bind_array->size() > 5 || bind_array->at(0).get()->array_row_num > 1) {
Expand Down