Further refactoringof the joins: move common code into the base class

Author: dyemanov

src/jrd/recsrc/FullOuterJoin.cpp

@@ -40,15 +40,16 @@ using namespace Jrd;
 FullOuterJoin::FullOuterJoin(CompilerScratch* csb,
 							 RecordSource* arg1, RecordSource* arg2,
 							 const StreamList& checkStreams)
-	: Join(csb, JoinType::OUTER),
-	  m_arg1(arg1),
-	  m_arg2(arg2),
+	: Join(csb, 2, JoinType::OUTER),
 	  m_checkStreams(csb->csb_pool, checkStreams)
 {
-	fb_assert(m_arg1 && m_arg2);
+	fb_assert(arg1 && arg2);
 
 	m_impure = csb->allocImpure<Impure>();
 	m_cardinality = arg1->getCardinality() + arg2->getCardinality();
+
+	m_args.add(arg1);
+	m_args.add(arg2);
 }
 
 void FullOuterJoin::internalOpen(thread_db* tdbb) const
@@ -58,52 +59,52 @@ void FullOuterJoin::internalOpen(thread_db* tdbb) const
 
 	impure->irsb_flags = irsb_open | irsb_first;
 
-	m_arg1->open(tdbb);
+	m_args[0]->open(tdbb);
 }
 
 void FullOuterJoin::close(thread_db* tdbb) const
 {
-	Request* const request = tdbb->getRequest();
+	const auto request = tdbb->getRequest();
 
 	invalidateRecords(request);
 
-	Impure* const impure = request->getImpure<Impure>(m_impure);
+	const auto impure = request->getImpure<Impure>(m_impure);
 
 	if (impure->irsb_flags & irsb_open)
 	{
 		impure->irsb_flags &= ~irsb_open;
 
-		if (impure->irsb_flags & irsb_first)
-			m_arg1->close(tdbb);
-		else
-			m_arg2->close(tdbb);
+		Join::close(tdbb);
 	}
 }
 
 bool FullOuterJoin::internalGetRecord(thread_db* tdbb) const
 {
 	JRD_reschedule(tdbb);
 
-	Request* const request = tdbb->getRequest();
-	Impure* const impure = request->getImpure<Impure>(m_impure);
+	const auto request = tdbb->getRequest();
+	const auto impure = request->getImpure<Impure>(m_impure);
 
 	if (!(impure->irsb_flags & irsb_open))
 		return false;
 
+	const auto arg1 = m_args[0];
+	const auto arg2 = m_args[1];
+
 	if (impure->irsb_flags & irsb_first)
 	{
-		if (m_arg1->getRecord(tdbb))
+		if (arg1->getRecord(tdbb))
 			return true;
 
 		impure->irsb_flags &= ~irsb_first;
-		m_arg1->close(tdbb);
-		m_arg2->open(tdbb);
+		arg1->close(tdbb);
+		arg2->open(tdbb);
 	}
 
 	// We should exclude matching records from the right-joined (second) record source,
 	// as they're already returned from the left-joined (first) record source
 
-	while (m_arg2->getRecord(tdbb))
+	while (arg2->getRecord(tdbb))
 	{
 		bool matched = false;
 
@@ -123,25 +124,11 @@ bool FullOuterJoin::internalGetRecord(thread_db* tdbb) const
 	return false;
 }
 
-bool FullOuterJoin::refetchRecord(thread_db* /*tdbb*/) const
-{
-	return true;
-}
-
-WriteLockResult FullOuterJoin::lockRecord(thread_db* tdbb) const
-{
-	SET_TDBB(tdbb);
-
-	status_exception::raise(Arg::Gds(isc_record_lock_not_supp));
-}
-
 void FullOuterJoin::getLegacyPlan(thread_db* tdbb, string& plan, unsigned level) const
 {
 	level++;
 	plan += "JOIN (";
-	m_arg1->getLegacyPlan(tdbb, plan, level);
-	plan += ", ";
-	m_arg2->getLegacyPlan(tdbb, plan, level);
+	Join::getLegacyPlan(tdbb, plan, level);
 	plan += ")";
 }
 
@@ -152,39 +139,5 @@ void FullOuterJoin::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsig
 	planEntry.lines.add().text = "Full Outer Join";
 	printOptInfo(planEntry.lines);
 
-	if (recurse)
-	{
-		++level;
-		m_arg1->getPlan(tdbb, planEntry.children.add(), level, recurse);
-		m_arg2->getPlan(tdbb, planEntry.children.add(), level, recurse);
-	}
-}
-
-void FullOuterJoin::markRecursive()
-{
-	m_arg1->markRecursive();
-	m_arg2->markRecursive();
-}
-
-void FullOuterJoin::findUsedStreams(StreamList& streams, bool expandAll) const
-{
-	m_arg1->findUsedStreams(streams, expandAll);
-	m_arg2->findUsedStreams(streams, expandAll);
-}
-
-bool FullOuterJoin::isDependent(const StreamList& streams) const
-{
-	return m_arg1->isDependent(streams) || m_arg2->isDependent(streams);
-}
-
-void FullOuterJoin::invalidateRecords(Request* request) const
-{
-	m_arg1->invalidateRecords(request);
-	m_arg2->invalidateRecords(request);
-}
-
-void FullOuterJoin::nullRecords(thread_db* tdbb) const
-{
-	m_arg1->nullRecords(tdbb);
-	m_arg2->nullRecords(tdbb);
+	Join::getPlan(tdbb, planEntry, level, recurse);
 }