firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 18:03:04 +01:00
Code Issues

- Optimize the case when we reached the max number of context vars (not a great concern).

Browse Source 
- Fix Vlad's code where he was only tracing attachment level context vars (and leaving apart txn context vars).
This commit is contained in:
robocop 2009-02-10 13:32:47 +00:00
parent 5e9c887fdf
commit 1e608a932e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jrd/functions.cpp
View File

@ -346,17 +346,20 @@ static SLONG set_context(const vary* ns_vary, const vary* name_vary, const vary*
if (!value_vary) {
result = context_vars->remove(name_str);
}
else
else if (context_vars->count() == MAX_CONTEXT_VARS)
{
string* rc = context_vars->get(name_str);
if (rc)
{
rc->assign(value_vary->vary_string, value_vary->vary_length);
result = true;
}
else
ERR_post(Arg::Gds(isc_ctx_too_big)); // "Too many context variables"
}
else
{
result = context_vars->put(name_str, Firebird::string(value_vary->vary_string, value_vary->vary_length));
if (context_vars->count() > MAX_CONTEXT_VARS)
{
context_vars->remove(name_str);
// "Too many context variables"
ERR_post(Arg::Gds(isc_ctx_too_big));
}
}
if (att->att_trace_manager->needs().event_set_context)
@ -366,7 +369,7 @@ static SLONG set_context(const vary* ns_vary, const vary* name_vary, const vary*
const Firebird::string* value_str = NULL;
if (value_vary)
value_str = att->att_context_vars.get(name_str);
value_str = context_vars->get(name_str);
TraceContextVarImpl ctxvar(ns_str.c_str(), name_str.c_str(),
value_str ? value_str->c_str() : NULL);