Fix the csb_sub_stream litetime accidentally broken by my refactoring

Author: dyemanov

src/jrd/RecordSourceNodes.cpp

@@ -54,6 +54,37 @@ static ValueExprNode* resolveUsingField(DsqlCompilerScratch* dsqlScratch, const
 
 namespace
 {
+	class AutoActivateResetStreams : public AutoStorage
+	{
+	public:
+		AutoActivateResetStreams(CompilerScratch* csb, const RseNode* rse)
+			: m_csb(csb), m_streams(getPool()), m_flags(getPool())
+		{
+			rse->computeRseStreams(m_streams);
+
+			m_flags.resize(m_streams.getCount());
+
+			FB_SIZE_T pos = 0;
+			for (const auto stream : m_streams)
+			{
+				m_flags[pos++] = m_csb->csb_rpt[stream].csb_flags;
+				m_csb->csb_rpt[stream].csb_flags |= (csb_active | csb_sub_stream);
+			}
+		}
+
+		~AutoActivateResetStreams()
+		{
+			FB_SIZE_T pos = 0;
+			for (const auto stream : m_streams)
+				m_csb->csb_rpt[stream].csb_flags = m_flags[pos++];
+		}
+
+	private:
+		CompilerScratch* m_csb;
+		StreamList m_streams;
+		HalfStaticArray<USHORT, OPT_STATIC_ITEMS> m_flags;
+	};
+
 	// Search through the list of ANDed booleans to find comparisons
 	// referring streams of the parent select expression.
 	// Extract those booleans and return them to the caller.
@@ -3604,10 +3635,7 @@ bool RseNode::computable(CompilerScratch* csb, StreamType stream,
 		return false;
 
 	// Set sub-streams of rse active
-	StreamList streams;
-	computeRseStreams(streams);
-	StreamStateHolder streamHolder(csb, streams);
-	streamHolder.activate(true);
+	AutoActivateResetStreams activator(csb, this);
 
 	// Check sub-stream
 	if ((rse_boolean && !rse_boolean->computable(csb, stream, allowOnlyCurrentStream)) ||

src/jrd/exe.h

@@ -609,7 +609,7 @@ class CompilerScratch : public pool_alloc<type_csb>
 		// We must zero-initialize this one
 		csb_repeat();
 
-		void activate(bool subStream = false);
+		void activate();
 		void deactivate();
 
 		Nullable<USHORT> csb_cursor_number;	// Cursor number for this stream
@@ -659,12 +659,9 @@ inline CompilerScratch::csb_repeat::csb_repeat()
 {
 }
 
-inline void CompilerScratch::csb_repeat::activate(bool subStream)
+inline void CompilerScratch::csb_repeat::activate()
 {
 	csb_flags |= csb_active;
-
-	if (subStream)
-		csb_flags |= csb_sub_stream;
 }
 
 inline void CompilerScratch::csb_repeat::deactivate()

src/jrd/optimizer/Optimizer.cpp

@@ -1729,7 +1729,7 @@ RecordSource* Optimizer::applyLocalBoolean(RecordSource* rsb,
 	globalHolder.deactivate();
 
 	StreamStateHolder localHolder(csb, streams);
-	localHolder.activate(csb);
+	localHolder.activate();
 
 	return applyBoolean(rsb, iter);
 }

src/jrd/optimizer/Optimizer.h

@@ -119,10 +119,10 @@ class StreamStateHolder
 		}
 	}
 
-	void activate(bool subStream = false)
+	void activate()
 	{
 		for (const auto stream : m_streams)
-			m_csb->csb_rpt[stream].activate(subStream);
+			m_csb->csb_rpt[stream].activate();
 	}
 
 	void deactivate()