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

Thread safety: do not write in request shared place during execution.

Browse Source
This commit is contained in:
asfernandes 2010-04-07 15:31:32 +00:00
parent c8e8b954ec
commit d515370b9d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dsql/AggNodes.cpp
View File

@ -371,9 +371,10 @@ void AggNode::aggPass(thread_db* tdbb, jrd_req* request) const
desc, &to, INTL_KEY_UNIQUE);
}
asb->asb_desc.dsc_address = data +
dsc toDesc = asb->asb_desc;
toDesc.dsc_address = data +
(asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
MOV_move(tdbb, desc, &asb->asb_desc);
MOV_move(tdbb, desc, &toDesc);
return;
}
@ -405,7 +406,7 @@ dsc* AggNode::execute(thread_db* tdbb, jrd_req* request) const
if (distinct)
{
impure_agg_sort* asbImpure = request->getImpure<impure_agg_sort>(asb->nod_impure);
dsc* desc = &asb->asb_desc;
dsc desc = asb->asb_desc;
// Sort the values already "put" to sort.
asbImpure->iasb_sort->sort(tdbb);
@ -425,9 +426,9 @@ dsc* AggNode::execute(thread_db* tdbb, jrd_req* request) const
break;
}
desc->dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
desc.dsc_address = data + (asb->asb_intl ? asb->asb_key_desc[1].skd_offset : 0);
aggPass(tdbb, request, desc);
aggPass(tdbb, request, &desc);
}
}

2
src/dsql/Nodes.h
View File

@ -448,7 +448,7 @@ public:
bool dialect1;
dsql_nod* dsqlArg;
jrd_nod* arg;
AggregateSort* asb;
const AggregateSort* asb;
bool indexed;
};

2
src/jrd/exe.h
View File

@ -185,7 +185,7 @@ public:
UCHAR nod_flags;
SCHAR nod_scale;
USHORT nod_count;
dsc asb_desc; // WARNING: non-impure place used in request execution
dsc asb_desc;
USHORT asb_length;
bool asb_intl;
sort_key_def* asb_key_desc; // for the aggregate