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

Fixed CORE-2132: Indexed retrieval cannot be chosen if a stored procedure is used inside the comparison predicate.

Browse Source
This commit is contained in:
dimitr 2008-10-19 12:05:36 +00:00
parent b703879da6
commit a58aaafdf2
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/jrd/Optimizer.cpp
View File

@ -88,15 +88,25 @@ bool OPT_computable(CompilerScratch* csb, const jrd_nod* node, SSHORT stream,
return false; return false;
} }
if (node->nod_type == nod_procedure) {
return false;
}
// Recurse thru interesting sub-nodes // Recurse thru interesting sub-nodes
const jrd_nod* const* ptr = node->nod_arg; const jrd_nod* const* ptr = node->nod_arg;
if (node->nod_type == nod_union) { if (node->nod_type == nod_procedure) {
const jrd_nod* clauses = node->nod_arg[e_uni_clauses]; const jrd_nod* const inputs = node->nod_arg[e_prc_inputs];
if (inputs) {
fb_assert(inputs->nod_type == nod_asn_list);
ptr = inputs->nod_arg;
for (const jrd_nod* const* const end = ptr + inputs->nod_count;
ptr < end; ptr++)
{
if (!OPT_computable(csb, *ptr, stream, idx_use, allowOnlyCurrentStream)) {
return false;
}
}
}
}
else if (node->nod_type == nod_union) {
const jrd_nod* const clauses = node->nod_arg[e_uni_clauses];
ptr = clauses->nod_arg; ptr = clauses->nod_arg;
for (const jrd_nod* const* const end = ptr + clauses->nod_count; for (const jrd_nod* const* const end = ptr + clauses->nod_count;
ptr < end; ptr += 2) ptr < end; ptr += 2)
@ -1030,7 +1040,7 @@ jrd_nod* OptimizerRetrieval::composeInversion(jrd_nod* node1, jrd_nod* node2,
return OPT_make_binary_node(node_type, node1, node2, false); return OPT_make_binary_node(node_type, node1, node2, false);
} }
void OptimizerRetrieval::findDependentFromStreams(jrd_nod* node, void OptimizerRetrieval::findDependentFromStreams(const jrd_nod* node,
SortedStreamList* streamList) const SortedStreamList* streamList) const
{ {
/************************************** /**************************************
@ -1044,14 +1054,22 @@ void OptimizerRetrieval::findDependentFromStreams(jrd_nod* node,
**************************************/ **************************************/
// Recurse thru interesting sub-nodes // Recurse thru interesting sub-nodes
jrd_nod** ptr = node->nod_arg; const jrd_nod* const* ptr = node->nod_arg;
if (node->nod_type == nod_procedure) { if (node->nod_type == nod_procedure) {
return; const jrd_nod* const inputs = node->nod_arg[e_prc_inputs];
if (inputs) {
fb_assert(inputs->nod_type == nod_asn_list);
ptr = inputs->nod_arg;
for (const jrd_nod* const* const end = ptr + inputs->nod_count;
ptr < end; ptr++)
{
findDependentFromStreams(*ptr, streamList);
}
}
} }
else if (node->nod_type == nod_union) {
if (node->nod_type == nod_union) { const jrd_nod* const clauses = node->nod_arg[e_uni_clauses];
jrd_nod* clauses = node->nod_arg[e_uni_clauses];
ptr = clauses->nod_arg; ptr = clauses->nod_arg;
for (const jrd_nod* const* const end = ptr + clauses->nod_count; for (const jrd_nod* const* const end = ptr + clauses->nod_count;
ptr < end; ptr += 2) ptr < end; ptr += 2)

2
src/jrd/Optimizer.h
View File

@ -180,7 +180,7 @@ public:
protected: protected:
jrd_nod* composeInversion(jrd_nod* node1, jrd_nod* node2, NOD_T node_type) const; jrd_nod* composeInversion(jrd_nod* node1, jrd_nod* node2, NOD_T node_type) const;
void findDependentFromStreams(jrd_nod* node, SortedStreamList* streamList) const; void findDependentFromStreams(const jrd_nod* node, SortedStreamList* streamList) const;
VaryingString* getAlias(); VaryingString* getAlias();
InversionCandidate* generateInversion(RecordSource** rsb); InversionCandidate* generateInversion(RecordSource** rsb);
RecordSource* generateNavigation(); RecordSource* generateNavigation();