Fixed DROP INDEX on temporary per-transaction table

Author: AlexPeshkoff

src/dsql/DdlNodes.epp

@@ -12524,6 +12524,7 @@ void ModifyIndexNode::modify(thread_db* tdbb, jrd_tra* transaction)
 	SET_TDBB(tdbb);
 
 	fb_assert(indexRelation);
+	indexRelation->fillPages(tdbb);
 
 	if (create)
 		step2(tdbb, transaction);
@@ -13927,6 +13928,7 @@ void AlterIndexNode::step2(thread_db* tdbb, jrd_tra* transaction)
 		{
 			// One way or another the index was just created, finalize it
 			StoreIndexNode storeNode(indexName, indexRelation, expressionIndex);
+			fb_assert(indexRelation->getBasePages()->rel_index_root);
 			storeNode.step2(tdbb, transaction);
 			return;
 		}
@@ -14278,12 +14280,8 @@ void DropIndexNode::step2(thread_db* tdbb, jrd_tra* transaction)
 
 	fb_assert(idxId >= 0 && idxId < dbb->dbb_max_idx);
 
-	RelationPages* relPages = indexRelation->getPages(tdbb, MAX_TRA_NUMBER, false);
-	if (relPages)
-	{
-		IDX_mark_index(tdbb, indexRelation, idxId);
+	if (IDX_mark_index(tdbb, indexRelation, idxId))
 		indexRelation->eraseIndex(tdbb, idxId);
-	}
 }
 
 

src/jrd/Relation.cpp

@@ -276,13 +276,12 @@ bool RelationPermanent::isReplicating(thread_db* tdbb)
 	return oldState == Bool3State::True;
 }
 
-RelationPages* RelationPermanent::fillPages(thread_db* tdbb)
+void RelationPermanent::fillPages(thread_db* tdbb)
 {
 	if (!rel_pages_base.rel_index_root)
 		DPM_scan_pages(tdbb);
 
 	fb_assert(rel_pages_base.rel_index_root);
-	return &rel_pages_base;
 }
 
 RelationPages* RelationPermanent::getPagesInternal(thread_db* tdbb, TraNumber tran, bool allocPages)

src/jrd/Relation.h

@@ -906,7 +906,7 @@ class RelationPermanent : public Firebird::PermanentStorage
 	};
 
 	RelationPages* getPages(thread_db* tdbb, TraNumber tran = MAX_TRA_NUMBER, bool allocPages = true);
-	RelationPages* fillPages(thread_db* tdbb);
+	void	fillPages(thread_db* tdbb);
 	RelationPages* getAttPages(thread_db* tdbb, RelationPages::InstanceId inst_id);
 	bool	delPages(thread_db* tdbb, TraNumber tran = MAX_TRA_NUMBER, RelationPages* aPages = NULL);
 	void	freePages(thread_db* tdbb);

src/jrd/idx.cpp

@@ -978,7 +978,7 @@ bool IDX_activate_index(thread_db* tdbb, Cached::Relation* relation, MetaId id)
 }
 
 
-void IDX_mark_index(thread_db* tdbb, Cached::Relation* relation, MetaId id)
+bool IDX_mark_index(thread_db* tdbb, Cached::Relation* relation, MetaId id)
 {
 /**************************************
  *
@@ -992,13 +992,19 @@ void IDX_mark_index(thread_db* tdbb, Cached::Relation* relation, MetaId id)
  **************************************/
 	SET_TDBB(tdbb);
 
-	auto* relPages = relation->fillPages(tdbb);
-	fb_assert(relPages->rel_index_root);
+	auto* relPages = relation->getPages(tdbb, MAX_TRA_NUMBER, false);
+	if (relPages)
+	{
+		fb_assert(relPages->rel_index_root);
 
-	WIN window(relPages->rel_pg_space_id, relPages->rel_index_root);
-	index_root_page* root = BTR_fetch_root_for_update(FB_FUNCTION, tdbb, &window);
+		WIN window(relPages->rel_pg_space_id, relPages->rel_index_root);
+		index_root_page* root = BTR_fetch_root_for_update(FB_FUNCTION, tdbb, &window);
 
-	BTR_mark_index_for_delete(tdbb, relation, id, &window, root, 0);
+		BTR_mark_index_for_delete(tdbb, relation, id, &window, root, 0);
+		return true;
+	}
+
+	return false;
 }
 
 void IDX_mark_temp(thread_db* tdbb, RelationPermanent* relation, MetaId id, Attachment* current, TraNumber tran)
@@ -1087,40 +1093,6 @@ void IDX_delete_indices(thread_db* tdbb, RelationPermanent* relation, RelationPa
 }
 
 
-void IDX_mark_indices(thread_db* tdbb, Cached::Relation* relation)
-{
-/**************************************
- *
- *	I D X _ m a r k _ i n d i c e s
- *
- **************************************
- *
- * Functional description
- *	Mark all known indices for delete in preparation for deleting a
- *	complete relation.
- *
- **************************************/
-	SET_TDBB(tdbb);
-
-	auto* relPages = relation->fillPages(tdbb);
-	fb_assert(relPages->rel_index_root);
-
-	WIN window(relPages->rel_pg_space_id, relPages->rel_index_root);
-	index_root_page* root = BTR_fetch_root_for_update(FB_FUNCTION, tdbb, &window);
-
-	// loop through pagespaces and mark for delete %%%%%%
-	// if ((relation->rel_flags & REL_temp_conn) && (relPages->rel_instance_id != 0))
-
-	for (USHORT i = 0; i < root->irt_count; i++)
-	{
-		BTR_mark_index_for_delete(tdbb, relation, i, &window, root, 0);
-		root = BTR_fetch_root_for_update(FB_FUNCTION, tdbb, &window);
-	}
-
-	CCH_RELEASE(tdbb, &window);
-}
-
-
 void IDX_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
 {
 /**************************************

src/jrd/idx_proto.h

@@ -43,11 +43,10 @@ void IDX_check_access(Jrd::thread_db*, Jrd::CompilerScratch*, Jrd::Cached::Relat
 bool IDX_check_master_types (Jrd::thread_db*, Jrd::index_desc&, Jrd::Cached::Relation*, int&);
 void IDX_create_index(Jrd::thread_db*, Jrd::IdxCreate createMethod, Jrd::jrd_rel*, Jrd::index_desc*,
 					  const Jrd::QualifiedName&, USHORT*, Jrd::jrd_tra*, Jrd::SelectivityList&);
-void IDX_mark_index(Jrd::thread_db*, Jrd::Cached::Relation*, MetaId);
+bool IDX_mark_index(Jrd::thread_db*, Jrd::Cached::Relation*, MetaId);
 void IDX_mark_temp(Jrd::thread_db* tdbb, Jrd::RelationPermanent* relation, MetaId id, Jrd::Attachment* current,
 				   TraNumber tran);
 void IDX_delete_indices(Jrd::thread_db*, Jrd::RelationPermanent*, Jrd::RelationPages*, bool);
-void IDX_mark_indices(Jrd::thread_db*, Jrd::Cached::Relation*);
 void IDX_erase(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*);
 void IDX_garbage_collect(Jrd::thread_db*, Jrd::record_param*, Jrd::RecordStack&, Jrd::RecordStack&);
 void IDX_modify(Jrd::thread_db*, Jrd::record_param*, Jrd::record_param*, Jrd::jrd_tra*);