Improvement CORE-4671 : Release internal temporary blobs early to fre…

…e some memory\disk space
FirebirdSQL · Jan 26, 2015 · 43f6746 · 43f6746
1 parent aaa2936
commit 43f6746
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/jrd/blb.cpp b/src/jrd/blb.cpp
@@ -246,7 +246,8 @@ blb* blb::create(thread_db* tdbb, jrd_tra* transaction, bid* blob_id)
 
 blb* blb::create2(thread_db* tdbb,
 				jrd_tra* transaction, bid* blob_id,
-				USHORT bpb_length, const UCHAR* bpb)
+				USHORT bpb_length, const UCHAR* bpb,
+				bool userBlob)
 {
 /**************************************
  *
@@ -341,6 +342,22 @@ blb* blb::create2(thread_db* tdbb,
 	page->blp_header.pag_type = pag_blob;
 	blob->blb_segment = (UCHAR*) page->blp_page;
 
+	// Bind non-user blob to the request
+
+	jrd_req* request = tdbb->getRequest();
+	if (!userBlob && request)
+	{
+		transaction->tra_blobs->locate(blob->blb_temp_id);
+		BlobIndex* current = &transaction->tra_blobs->current();
+
+		jrd_req* blob_request = request;
+		while (blob_request->req_caller)
+			blob_request = blob_request->req_caller;
+
+		current->bli_request = blob_request;
+		current->bli_request->req_blobs.add(blob->blb_temp_id);
+	}
+
 	// Format blob id and return blob handle
 
 	blob_id->set_temporary(blob->blb_temp_id);

diff --git a/src/jrd/blb.h b/src/jrd/blb.h
@@ -98,7 +98,7 @@ class blb : public pool_alloc<type_blb>
 	void	BLB_check_well_formed(thread_db*, const dsc* desc);
 	void	BLB_close(thread_db*);
 	static blb*	create(thread_db*, jrd_tra*, bid*);
-	static blb*	create2(thread_db*, jrd_tra*, bid*, USHORT, const UCHAR*);
+	static blb*	create2(thread_db*, jrd_tra*, bid*, USHORT, const UCHAR*, bool = false);
 	static Jrd::blb* get_array(Jrd::thread_db*, Jrd::jrd_tra*, const Jrd::bid*, Ods::InternalArrayDesc*);
 	ULONG	BLB_get_data(thread_db*, UCHAR*, SLONG, bool = true);
 	USHORT	BLB_get_segment(thread_db*, void*, USHORT);

diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -2355,7 +2355,7 @@ JBlob* JAttachment::createBlob(CheckStatusWrapper* user_status, ITransaction* tr
 		try
 		{
 			jrd_tra* const transaction = find_transaction(tdbb);
-			blob = blb::create2(tdbb, transaction, reinterpret_cast<bid*>(blob_id), bpb_length, bpb);
+			blob = blb::create2(tdbb, transaction, reinterpret_cast<bid*>(blob_id), bpb_length, bpb, true);
 		}
 		catch (const Exception& ex)
 		{