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

More correct plan output for subqueries generated during NOT IN transformation

Browse Source
This commit is contained in:
Dmitry Yemanov 2025-01-10 11:19:54 +03:00
parent b4e2ea4db3
commit b2d03a0f51
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dsql/BoolNodes.cpp
View File

@ -2176,16 +2176,20 @@ BoolExprNode* RseBoolNode::convertNeqAllToNotAny(thread_db* tdbb, CompilerScratc
andNode->arg1 = missNode; andNode->arg1 = missNode;
RseNode* newInnerRse1 = innerRse->clone(csb->csb_pool);
newInnerRse1->flags |= RseNode::FLAG_SUB_QUERY;
RseBoolNode* rseBoolNode = FB_NEW_POOL(csb->csb_pool) RseBoolNode(csb->csb_pool, blr_any); RseBoolNode* rseBoolNode = FB_NEW_POOL(csb->csb_pool) RseBoolNode(csb->csb_pool, blr_any);
rseBoolNode->rse = innerRse; rseBoolNode->rse = newInnerRse1;
rseBoolNode->ownSavepoint = this->ownSavepoint; rseBoolNode->ownSavepoint = this->ownSavepoint;
andNode->arg2 = rseBoolNode; andNode->arg2 = rseBoolNode;
RseNode* newInnerRse = innerRse->clone(csb->csb_pool); RseNode* newInnerRse2 = innerRse->clone(csb->csb_pool);
newInnerRse2->flags |= RseNode::FLAG_SUB_QUERY;
rseBoolNode = FB_NEW_POOL(csb->csb_pool) RseBoolNode(csb->csb_pool, blr_any); rseBoolNode = FB_NEW_POOL(csb->csb_pool) RseBoolNode(csb->csb_pool, blr_any);
rseBoolNode->rse = newInnerRse; rseBoolNode->rse = newInnerRse2;
rseBoolNode->ownSavepoint = this->ownSavepoint; rseBoolNode->ownSavepoint = this->ownSavepoint;
orNode->arg2 = rseBoolNode; orNode->arg2 = rseBoolNode;
@ -2201,16 +2205,16 @@ BoolExprNode* RseBoolNode::convertNeqAllToNotAny(thread_db* tdbb, CompilerScratc
outerRseNeq->blrOp = blr_eql; outerRseNeq->blrOp = blr_eql;
// If there was a boolean on the stream, append (AND) the new one // If there was a boolean on the stream, append (AND) the new one
if (newInnerRse->rse_boolean) if (newInnerRse2->rse_boolean)
{ {
andNode = FB_NEW_POOL(csb->csb_pool) BinaryBoolNode(csb->csb_pool, blr_and); andNode = FB_NEW_POOL(csb->csb_pool) BinaryBoolNode(csb->csb_pool, blr_and);
andNode->arg1 = newInnerRse->rse_boolean; andNode->arg1 = newInnerRse2->rse_boolean;
andNode->arg2 = boolean; andNode->arg2 = boolean;
boolean = andNode; boolean = andNode;
} }
newInnerRse->rse_boolean = boolean; newInnerRse2->rse_boolean = boolean;
SubExprNodeCopier copier(csb->csb_pool, csb); SubExprNodeCopier copier(csb->csb_pool, csb);
return copier.copy(tdbb, static_cast<BoolExprNode*>(newNode)); return copier.copy(tdbb, static_cast<BoolExprNode*>(newNode));