Fix DLTT bugchecks after errors - thanks Pavel Zotov

Author: asfernandes

src/dsql/StmtNodes.cpp

@@ -2160,7 +2160,38 @@ void DeclareLocalTableNode::reset(thread_db* tdbb, Request* request) const
 	if (relation)
 	{
 		const auto permanent = relation->getPermanent();
-		permanent->delPages(tdbb, request->getLocalTableInstanceId(tdbb));
+		const auto tempInstanceId = request->getLocalTableInstanceId(tdbb);
+		const auto transaction = request->req_transaction;
+
+		try
+		{
+			permanent->delPages(tdbb, tempInstanceId);
+
+			if (transaction)
+				transaction->discardTempFrameActions(relation, tempInstanceId);
+		}
+		catch (const Exception&)
+		{
+			fb_assert(false);
+
+			if (transaction)
+			{
+				try
+				{
+					transaction->discardTempFrameActions(relation, tempInstanceId);
+				}
+				catch (const Exception&)
+				{
+					// Preserve the original frame teardown error.
+					fb_assert(false);
+				}
+			}
+
+			for (auto current = transaction; current; current = current->tra_outer)
+				current->tra_flags |= TRA_invalidated;
+
+			throw;
+		}
 	}
 }
 

src/jrd/Savepoint.cpp

@@ -251,7 +251,7 @@ void VerbAction::mergeTo(thread_db* tdbb, jrd_tra* transaction, VerbAction* next
 		}
 	}
 
-	release(tdbb, transaction);
+	discard(transaction);
 }
 
 void VerbAction::undo(thread_db* tdbb, jrd_tra* transaction, bool preserveLocks, VerbAction* preserveAction)
@@ -366,13 +366,11 @@ void VerbAction::undo(thread_db* tdbb, jrd_tra* transaction, bool preserveLocks,
 		delete rpb.rpb_record;
 	}
 
-	release(tdbb, transaction);
+	discard(transaction);
 }
 
-void VerbAction::release(thread_db* tdbb, jrd_tra* transaction)
+void VerbAction::discard(jrd_tra* transaction)
 {
-	AutoSetRestore<FB_UINT64> autoFrameId(&tdbb->tdbb_temp_frame_id, vct_temp_instance_id);
-
 	// Release resources used by this verb action
 
 	RecordBitmap::reset(vct_records);
@@ -439,23 +437,26 @@ void Savepoint::cleanupTempData()
 	for (VerbAction* action = m_actions; action; action = action->vct_next)
 	{
 		if (action->vct_relation->getPermanent()->rel_flags & (REL_temp_tran | REL_temp_frame))
-		{
-			RecordBitmap::reset(action->vct_records);
+			action->discard(m_transaction);
+	}
+}
 
-			if (action->vct_undo)
-			{
-				if (action->vct_undo->getFirst())
-				{
-					do
-					{
-						action->vct_undo->current().release(m_transaction);
-					} while (action->vct_undo->getNext());
-				}
 
-				delete action->vct_undo;
-				action->vct_undo = NULL;
-			}
+void Savepoint::discardTempFrameActions(const jrd_rel* relation, FB_UINT64 tempInstanceId)
+{
+	for (auto actionPtr = &m_actions; *actionPtr;)
+	{
+		const auto action = *actionPtr;
+
+		if (action->vct_relation == relation && action->vct_temp_instance_id == tempInstanceId)
+		{
+			action->discard(m_transaction);
+			*actionPtr = action->vct_next;
+			action->vct_next = m_freeActions;
+			m_freeActions = action;
 		}
+		else
+			actionPtr = &action->vct_next;
 	}
 }
 

src/jrd/Savepoint.h

@@ -98,8 +98,7 @@ namespace Jrd
 		void garbageCollectIdxLite(thread_db* tdbb, jrd_tra* transaction, SINT64 recordNumber,
 								   VerbAction* nextAction, Record* goingRecord);
 
-	private:
-		void release(thread_db* tdbb, jrd_tra* transaction);
+		void discard(jrd_tra* transaction);
 	};
 
 	// LTT undo item - stores original state of a LocalTemporaryTable for savepoint rollback
@@ -262,6 +261,7 @@ namespace Jrd
 			LocalTemporaryTable* original = nullptr);
 
 		void cleanupTempData();
+		void discardTempFrameActions(const jrd_rel* relation, FB_UINT64 tempInstanceId);
 
 		Savepoint* rollback(thread_db* tdbb, Savepoint* prior = NULL, bool preserveLocks = false);
 		Savepoint* rollforward(thread_db* tdbb, Savepoint* prior = NULL);

src/jrd/tra.cpp

@@ -4112,6 +4112,20 @@ void jrd_tra::rollbackToSavepoint(thread_db* tdbb, SavNumber number)
 }
 
 
+void jrd_tra::discardTempFrameActions(const jrd_rel* relation, FB_UINT64 tempInstanceId)
+{
+	fb_assert(relation);
+	fb_assert(relation->getPermanent()->rel_flags & REL_temp_frame);
+	fb_assert(tempInstanceId);
+
+	for (auto transaction = this; transaction; transaction = transaction->tra_outer)
+	{
+		for (Savepoint::Iterator iter(transaction->tra_save_point); *iter; ++iter)
+			(*iter)->discardTempFrameActions(relation, tempInstanceId);
+	}
+}
+
+
 void jrd_tra::releaseSavepoint(thread_db* tdbb)
 /**************************************
  *

src/jrd/tra.h

@@ -407,6 +407,7 @@ class jrd_tra final : public pool_alloc<type_tra>
 	Savepoint* startSavepoint(bool root = false);
 	void rollbackSavepoint(thread_db* tdbb, bool preserveLocks = false);
 	void rollbackToSavepoint(thread_db* tdbb, SavNumber number);
+	void discardTempFrameActions(const jrd_rel* relation, FB_UINT64 tempInstanceId);
 	void releaseSavepoint(thread_db* tdbb);
 	DbCreatorsList* getDbCreatorsList();
 	void checkBlob(thread_db* tdbb, const bid* blob_id, jrd_fld* fld, bool punt);