Rolled-back old fix for CORE-6015. Next attempt to fix it

AlexPeshkoff · AlexPeshkoff · commit 1eba28b1b739 · 2021-04-13T12:09:31.000+03:00
diff --git a/src/jrd/btr.cpp b/src/jrd/btr.cpp
@@ -545,7 +545,14 @@ DSC* BTR_eval_expression(thread_db* tdbb, index_desc* idx, Record* record, bool&
 	SET_TDBB(tdbb);
 	fb_assert(idx->idx_expression != NULL);
 
+	// check for resursive expression evaluation
 	jrd_req* const org_request = tdbb->getRequest();
+	for (auto req = org_request->req_caller; req; req = req->req_caller)
+	{
+		if (req->getStatement() == idx->idx_expression_statement)
+			ERR_post(Arg::Gds(isc_random) << "Attempt to evaluate index expression recursively");
+	}
+
 	jrd_req* const expr_request = idx->idx_expression_statement->findRequest(tdbb);
 	fb_assert(expr_request != org_request);
 
diff --git a/src/jrd/idx.cpp b/src/jrd/idx.cpp
@@ -735,9 +735,6 @@ void IDX_garbage_collect(thread_db* tdbb, record_param* rpb, RecordStack& going,
 	insertion.iib_key = &key1;
 	insertion.iib_btr_level = 0;
 
-	Attachment* att = tdbb->getAttachment();
-	AutoSetRestoreFlag<ULONG> gc(&att->att_flags, ATT_no_cleanup, true);
-
 	WIN window(get_root_page(tdbb, rpb->rpb_relation));
 
 	index_root_page* root = (index_root_page*) CCH_FETCH(tdbb, &window, LCK_read, pag_root);
