Cleanup old bulk insert code

Author: hvlad

src/dsql/StmtNodes.cpp

@@ -9678,9 +9678,6 @@ const StmtNode* StoreNode::store(thread_db* tdbb, Request* request, WhichTrigger
 	record_param* rpb = &request->req_rpb[stream];
 	jrd_rel* relation = rpb->rpb_relation;
 
-	if ((marks & MARK_BULK_INSERT) || request->req_batch_mode)
-		rpb->rpb_stream_flags |= RPB_s_bulk;
-
 	const auto localTableSource = nodeAs<LocalTableSourceNode>(target);
 	const auto localTable = localTableSource ?
 		request->getStatement()->localTables[localTableSource->tableNumber] :

src/dsql/StmtNodes.h

@@ -44,7 +44,6 @@ class RecordBuffer;
 class RelationSourceNode;
 class SelectNode;
 class GeneratorItem;
-class BulkInsert;
 
 
 class ExceptionItem final : public Firebird::PermanentStorage, public Printable

src/jrd/blb.cpp

@@ -1264,12 +1264,7 @@ void blb::move(thread_db* tdbb, dsc* from_desc, dsc* to_desc,
 	if (bulkInsert)
 		destination->set_permanent(relation->getId(), bulkInsert->putBlob(tdbb, blob, record));
 	else
-	{
-		if (bulk)
-			blob->blb_flags |= BLB_bulk;
-
 		destination->set_permanent(relation->getId(), DPM_store_blob(tdbb, blob, relation, record));
-	}
 
 	// This is the only place in the engine where blobs are materialized
 	// If new places appear code below should transform to common sub-routine

src/jrd/blb.h

@@ -182,8 +182,7 @@ inline constexpr int BLB_damaged		= 16;		// Blob is busted
 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_bulk			= 256;		// Blob created by bulk insert operation
-inline constexpr int BLB_user			= 512;		// User-defined blob
+inline constexpr int BLB_user			= 256;		// User-defined blob
 
 /* Blob levels are:
 

src/jrd/dpm.epp

@@ -2488,9 +2488,6 @@ RecordNumber DPM_store_blob(thread_db* tdbb, blb* blob, jrd_rel* relation, Recor
 	rpb.rpb_transaction_nr = tdbb->getTransaction()->tra_number;
 	rpb.rpb_flags = rpb_blob;
 
-	if (blob->blb_flags & BLB_bulk)
-		rpb.rpb_stream_flags |= RPB_s_bulk;
-
 	blh* header = (blh*) locate_space(tdbb, &rpb, (SSHORT) (BLH_SIZE + length),
 									  stack, record, DPM_other);
 	header->blh_flags = rhd_blob;
@@ -3691,17 +3688,9 @@ static rhd* locate_space(thread_db* tdbb,
 	ULONG pp_sequence =
 		(type == DPM_primary ? relPages->rel_pri_data_space : relPages->rel_sec_data_space);
 
-	const bool bulkInsert = (type == DPM_primary || isBlob) && (rpb->rpb_stream_flags & RPB_s_bulk);
-
 	for (;; pp_sequence++)
 	{
-		// Bulk inserts looks up for empty DP only to avoid contention with
-		// another attachments doing bulk inserts. Note, DP number is saved in
-		// relPages->rel_last_free_pri_dp and next insert by same attachment
-		// will use same DP while concurrent bulk attachments will ignore it as
-		// non-empty. Take write lock on PP early to clear 'empty' flag.
-
-		locklevel_t ppLock = bulkInsert ? LCK_write : LCK_read;
+		locklevel_t ppLock = LCK_read;
 
 		if (type == DPM_primary)
 			relPages->rel_pri_data_space = pp_sequence;
@@ -3745,9 +3734,6 @@ static rhd* locate_space(thread_db* tdbb,
 			bool dp_is_empty = PPG_DP_BIT_TEST(bits, slot, ppg_dp_empty);
 			bool dp_is_secondary = PPG_DP_BIT_TEST(bits, slot, ppg_dp_secondary);
 
-			if (bulkInsert && !dp_is_empty)
-				continue;
-
 			if (dp_is_empty)
 			{
 				if (ppLock == LCK_read)

src/jrd/exe.cpp

@@ -473,7 +473,6 @@ void EXE_assignment(thread_db* tdbb, const ValueExprNode* to, dsc* from_desc,
 			jrd_rel* relation = nullptr;
 			Record* record = nullptr;
 			USHORT fieldId = 0;
-			bool bulk = false;
 
 			if (to)
 			{
@@ -484,13 +483,12 @@ void EXE_assignment(thread_db* tdbb, const ValueExprNode* to, dsc* from_desc,
 					relation = rpb->rpb_relation;
 					record = rpb->rpb_record;
 					fieldId = toField->fieldId;
-					bulk = rpb->rpb_stream_flags & RPB_s_bulk;
 				}
 				else if (!(nodeAs<ParameterNode>(to) || nodeAs<VariableNode>(to)))
 					BUGCHECK(199);	// msg 199 expected field node
 			}
 
-			blb::move(tdbb, from_desc, to_desc, relation, record, fieldId, bulk);
+			blb::move(tdbb, from_desc, to_desc, relation, record, fieldId);
 		}
 		else if (!DSC_EQUIV(from_desc, to_desc, false))
 		{

src/jrd/req.h

@@ -155,12 +155,11 @@ inline constexpr USHORT rpb_not_packed	= 2048;		// record (or delta) is stored "
 
 // Stream flags
 
-inline constexpr USHORT RPB_s_update	= 0x01;	// input stream fetched for update
-inline constexpr USHORT RPB_s_no_data	= 0x02;	// nobody is going to access the data
-inline constexpr USHORT RPB_s_sweeper	= 0x04;	// garbage collector - skip swept pages
-inline constexpr USHORT RPB_s_unstable	= 0x08;	// don't use undo log, used with unstable explicit cursors
-inline constexpr USHORT RPB_s_bulk		= 0x10;	// bulk operation (currently insert only)
-inline constexpr USHORT RPB_s_skipLocked = 0x20;	// skip locked record
+inline constexpr USHORT RPB_s_update		= 0x01;	// input stream fetched for update
+inline constexpr USHORT RPB_s_no_data		= 0x02;	// nobody is going to access the data
+inline constexpr USHORT RPB_s_sweeper		= 0x04;	// garbage collector - skip swept pages
+inline constexpr USHORT RPB_s_unstable		= 0x08;	// don't use undo log, used with unstable explicit cursors
+inline constexpr USHORT RPB_s_skipLocked	= 0x10;	// skip locked record
 
 // Runtime flags