Remove the outdated dependancy tracking. Exclude parent conjuncts fro…

…m the invariant checks.
FirebirdSQL · Mar 3, 2025 · 04cd8c3 · 04cd8c3
1 parent f7e16a1
commit 04cd8c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/src/jrd/optimizer/InnerJoin.cpp b/src/jrd/optimizer/InnerJoin.cpp
@@ -587,30 +587,6 @@ River* InnerJoin::formRiver()
 		}
 		else
 		{
-			StreamList depStreams;
-
-			if (optimizer->isSemiJoined() && rsbs.isEmpty())
-			{
-				const auto baseStream = getStreamInfo(stream.number);
-				for (const auto boolean : baseStream->baseConjuncts)
-				{
-					if (optimizer->checkEquiJoin(boolean))
-					{
-						SortedStreamList nodeStreams;
-						boolean->collectStreams(nodeStreams);
-
-						for (const auto stream : nodeStreams)
-						{
-							if (stream != baseStream->number && !depStreams.exist(stream))
-								depStreams.add(stream);
-						}
-					}
-				}
-			}
-
-			StreamStateHolder stateHolder(csb, depStreams);
-			stateHolder.deactivate();
-
 			rsb = optimizer->generateRetrieval(stream.number, sortPtr, false, false);
 		}
 

diff --git a/src/jrd/optimizer/Optimizer.cpp b/src/jrd/optimizer/Optimizer.cpp
@@ -850,7 +850,7 @@ RecordSource* Optimizer::compile(BoolExprNodeStack* parentStack)
 
 	if (isInnerJoin())
 	{
-		for (auto iter = getConjuncts(); iter.hasData(); ++iter)
+		for (auto iter = getBaseConjuncts(); iter.hasData(); ++iter)
 		{
 			if (!(iter & CONJUNCT_USED) &&
 				iter->deterministic() &&