Fix regression #8948: Firebird 5.0.4 snapshot (build 1784) performance issue

Author: dyemanov

src/jrd/optimizer/Optimizer.cpp

@@ -2435,6 +2435,9 @@ bool Optimizer::joinDependentStreams(StreamList& joinStreams, RiverList& rivers,
 
 			// Make rivers from the dependent streams
 			generateInnerJoin(dependentStreams, rivers, sort, rse->rse_plan);
+
+			for (const auto depStream : dependentStreams)
+				csb->csb_rpt[depStream].activate();
 		}
 		else
 		{
@@ -2787,7 +2790,7 @@ bool Optimizer::generateEquiJoin(RiverList& rivers, JoinType joinType)
 //	then form streams into rivers (combinations of streams)
 //
 
-void Optimizer::generateInnerJoin(StreamList& streams,
+void Optimizer::generateInnerJoin(const StreamList& streams,
 								  RiverList& rivers,
 								  SortNode** sortClause,
 								  const PlanNode* planClause)
@@ -2809,16 +2812,6 @@ void Optimizer::generateInnerJoin(StreamList& streams,
 	{
 		const auto river = innerJoin.formRiver();
 		rivers.add(river);
-
-		// Remove already consumed streams from the source stream list
-		for (const auto stream : river->getStreams())
-		{
-			FB_SIZE_T pos;
-			if (streams.find(stream, pos))
-				streams.remove(pos);
-			else
-				fb_assert(false);
-		}
 	}
 }
 

src/jrd/optimizer/Optimizer.h

@@ -585,7 +585,7 @@ class Optimizer : public Firebird::PermanentStorage
 					SortNode** sortClause,
 					const PlanNode* planClause);
 	bool generateEquiJoin(RiverList& rivers, JoinType joinType = INNER_JOIN);
-	void generateInnerJoin(StreamList& streams,
+	void generateInnerJoin(const StreamList& streams,
 						   RiverList& rivers,
 						   SortNode** sortClause,
 						   const PlanNode* planClause);