This should fix #8113: UNION ALL optimization with constant false condition

dyemanov · dyemanov · commit 70a60ba8166f · 2024-11-15T12:44:16.000+03:00
diff --git a/src/jrd/optimizer/Optimizer.cpp b/src/jrd/optimizer/Optimizer.cpp
@@ -798,7 +798,7 @@ RecordSource* Optimizer::compile(BoolExprNodeStack* parentStack)
 	BoolExprNode* invariantBoolean = nullptr;
 	if (isInnerJoin())
 	{
-		for (auto iter = getBaseConjuncts(); iter.hasData(); ++iter)
+		for (auto iter = getConjuncts(); iter.hasData(); ++iter)
 		{
 			if (!(iter & CONJUNCT_USED) &&
 				iter->computable(csb, INVALID_STREAM, false))

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ RecordSource* Optimizer::compile(BoolExprNodeStack* parentStack)`
`798`	`798`	`BoolExprNode* invariantBoolean = nullptr;`
`799`	`799`	`if (isInnerJoin())`
`800`	`800`	`{`
`801`		`- for (auto iter = getBaseConjuncts(); iter.hasData(); ++iter)`
	`801`	`+ for (auto iter = getConjuncts(); iter.hasData(); ++iter)`
`802`	`802`	`{`
`803`	`803`	`if (!(iter & CONJUNCT_USED) &&`
`804`	`804`	`iter->computable(csb, INVALID_STREAM, false))`