Put DLTT blobs in tra_blobs

Author: asfernandes

src/jrd/BlobUtil.cpp

@@ -53,7 +53,7 @@ namespace
 			status_exception::raise(Arg::Gds(isc_bad_segstr_id));
 
 		const auto blobIndex = &transaction->tra_blobs->current();
-		fb_assert(blobIndex->bli_blob_object);
+		fb_assert(blobIndex->bli_materialized || blobIndex->bli_blob_object);
 
 		return blobIndex;
 	}
@@ -72,7 +72,7 @@ IExternalResultSet* BlobUtilPackage::cancelBlobProcedure(ThrowStatusExceptionWra
 
 	if (const auto blobIdx = getTempBlobIndexFromId(tdbb, blobId))
 	{
-		if (blobIdx->bli_materialized)
+		if (blobIdx->bli_materialized || (blobIdx->bli_blob_object->blb_flags & BLB_dltt))
 			status_exception::raise(Arg::Gds(isc_bad_segstr_id));
 
 		const auto blob = blobIdx->bli_blob_object;
@@ -108,7 +108,9 @@ void BlobUtilPackage::isWritableFunction(ThrowStatusExceptionWrapper* status,
 
 	if (const auto blobIdx = getTempBlobIndexFromId(tdbb, blobId))
 	{
-		if (!blobIdx->bli_materialized && (blobIdx->bli_blob_object->blb_flags & BLB_close_on_read))
+		if (!blobIdx->bli_materialized &&
+			!(blobIdx->bli_blob_object->blb_flags & BLB_dltt) &&
+			(blobIdx->bli_blob_object->blb_flags & BLB_close_on_read))
 		{
 			out->boolean = FB_TRUE;
 			return;

src/jrd/Statement.cpp

@@ -1064,7 +1064,7 @@ Request* Request::getLocalTableRequest(bool outerDecl)
 
 	if (outerDecl)
 	{
-		while (request->req_caller)
+		while (request->getStatement()->parentStatement)
 			request = request->req_caller;
 	}
 

src/jrd/blb.cpp

@@ -477,7 +477,8 @@ void BLB_garbage_collect(thread_db* tdbb,
 						bmGoing.set(number.getValue());
 						cntGoing++;
 					}
-					else
+					else if (!(relation->getPermanent()->rel_flags & REL_temp_frame) ||
+						blob->bid_internal.bid_relation_id)
 					{
 						// hvlad: blob_id in descriptor is not from our relation. Yes, it is
 						// garbage in user data but we can handle it without bugcheck - just
@@ -520,7 +521,8 @@ void BLB_garbage_collect(thread_db* tdbb,
 								return;
 						}
 					}
-					else
+					else if (!(relation->getPermanent()->rel_flags & REL_temp_frame) ||
+						blob->bid_internal.bid_relation_id)
 					{
 						gds__log("staying blob (%ld:%ld) is not owned by relation (id = %d), ignored",
 							blob->bid_quad.bid_quad_high, blob->bid_quad.bid_quad_low, relation->getId());
@@ -1109,8 +1111,6 @@ void blb::move(thread_db* tdbb, dsc* from_desc, dsc* to_desc,
 		ERR_post(Arg::Gds(isc_read_only));
 	}
 
-	RelationPages* relPages = relation->getPermanent()->getPages(tdbb);
-
 	// If either the source value is null or the blob id itself is null
 	// (all zeros), then the blob is null.
 
@@ -1125,6 +1125,65 @@ void blb::move(thread_db* tdbb, dsc* from_desc, dsc* to_desc,
 	jrd_tra* transaction = request->req_transaction;
 	transaction = transaction->getOuter();
 
+	// Declared LTT records live only in an execution frame, while their BLOB
+	// values must be usable outside that frame. Keep the value as a transaction
+	// temporary BLOB instead of storing a frame-scoped permanent ID.
+	if (MetadataCache::isDeclaredLTT(relation->getId()))
+	{
+		bool directMove = false;
+
+		if (!needFilter && !source->bid_internal.bid_relation_id &&
+			transaction->tra_blobs->locate(source->bid_temp_id()))
+		{
+			const auto sourceIndex = &transaction->tra_blobs->current();
+
+			if (!sourceIndex->bli_materialized)
+			{
+				const auto sourceBlob = sourceIndex->bli_blob_object;
+
+				if (!sourceBlob || !(sourceBlob->blb_flags & BLB_closed))
+				{
+					if (sourceBlob && (sourceBlob->blb_flags & BLB_close_on_read))
+						sourceBlob->BLB_close(tdbb);
+					else
+						ERR_post(Arg::Gds(isc_bad_segstr_id));
+				}
+
+				directMove = true;
+			}
+		}
+
+		if (directMove)
+			*destination = *source;
+		else
+		{
+			UCharBuffer bpb;
+			if (needFilter)
+				BLB_gen_bpb_from_descs(from_desc, to_desc, bpb);
+
+			const auto dbb = tdbb->getDatabase();
+			const USHORT pageSpace = dbb->dbb_page_manager.getTempPageSpaceID(tdbb);
+			blb* const blob = copy_blob(tdbb, source, destination,
+				bpb.getCount(), bpb.begin(), pageSpace);
+
+			blob->blb_flags |= BLB_dltt;
+			blob->blb_sub_type = to_desc->getBlobSubType();
+			blob->blb_charset = to_desc->getCharSet();
+		}
+
+		fb_assert(!destination->bid_internal.bid_relation_id);
+		fb_assert(transaction);
+
+		if (!transaction->tra_blobs->locate(destination->bid_temp_id()))
+			BUGCHECK(305); // msg 305 Blobs accounting is inconsistent
+
+		BlobIndex* const blobIndex = &transaction->tra_blobs->current();
+		fb_assert(!blobIndex->bli_materialized);
+		fb_assert(blobIndex->bli_blob_object);
+
+		return;
+	}
+
 	// If the target is a view, this must be from a view update trigger.
 	// Just pass the blob id thru.
 
@@ -1150,6 +1209,8 @@ void blb::move(thread_db* tdbb, dsc* from_desc, dsc* to_desc,
 		return;
 	}
 
+	RelationPages* relPages = relation->getPermanent()->getPages(tdbb);
+
 	// If the source is a permanent blob, then the blob must be copied.
 	// Otherwise find the temporary blob referenced.
 
@@ -2602,6 +2663,9 @@ static void move_from_string(thread_db* tdbb, const dsc* from_desc, dsc* to_desc
 	temp_bid.clear();
 	blb* blob = blb::create2(tdbb, transaction, &temp_bid, bpb.getCount(), bpb.begin());
 
+	if (relation && MetadataCache::isDeclaredLTT(relation->getId()))
+		blob->blb_flags |= BLB_dltt;
+
 	dsc blob_desc;
 
 	blob_desc.dsc_scale = to_desc->dsc_scale;	// blob charset

src/jrd/blb.h

@@ -104,7 +104,7 @@ class blb : public pool_alloc<type_blb>
 	void	BLB_check_well_formed(thread_db*, const dsc* desc);
 	bool	BLB_close(thread_db*);
 	static blb*	create(thread_db*, jrd_tra*, bid*);
-	static blb*	create2(thread_db*, jrd_tra*, bid*, USHORT, const UCHAR*, bool = false);
+	static blb* create2(thread_db*, jrd_tra*, bid*, USHORT, const UCHAR*, bool = false);
 	static blb* get_array(thread_db*, jrd_tra*, const bid*, Ods::InternalArrayDesc*);
 	ULONG	BLB_get_data(thread_db*, UCHAR*, SLONG, bool = true);
 	USHORT	BLB_get_segment(thread_db*, void*, USHORT);
@@ -183,6 +183,7 @@ inline constexpr int BLB_seek			= 32;		// Seek is pending
 inline constexpr int BLB_large_scan		= 64;		// Blob is larger than page buffer cache
 inline constexpr int BLB_close_on_read	= 128;		// Temporary blob is not closed until read
 inline constexpr int BLB_user			= 256;		// User-defined blob
+inline constexpr int BLB_dltt			= 512;		// Blob stored in a declared local temporary table
 
 /* Blob levels are:
 

src/jrd/met.h

@@ -457,6 +457,11 @@ class MetadataCache : public Firebird::PermanentStorage
 		return (id >= MIN_LTT_ID && id <= MAX_LTT_ID);
 	}
 
+	static bool isDeclaredLTT(MetaId id)
+	{
+		return (id >= MIN_DECLARED_LTT_ID && id <= MAX_DECLARED_LTT_ID);
+	}
+
 
 private:
 	static jrd_rel* getLtt(thread_db* tdbb, MetaId id);