Fixed #8444: GBAK: GDS error batch_big_seg2 when restoring a table with many BLOBs, thanks to Vlad (#8574)

Co-authored-by: Alexander Peshkov <[email protected]>
Co-authored-by: Artyom Ivanov <[email protected]>

Author: 3 people

src/burp/BurpTasks.cpp

@@ -92,6 +92,33 @@ class BurpGblHolder
 };
 
 
+class SimpleGblHolder
+{
+public:
+	SimpleGblHolder(BurpGlobals* gbl)
+	{
+		m_prev = BurpGlobals::getSpecific();
+
+		// Avoid threadDataPriorContext == this, it makes a loop in linked list of contexts
+		if (m_prev != gbl)
+			BurpGlobals::putSpecific(gbl);
+	}
+
+	~SimpleGblHolder()
+	{
+		BurpGlobals* gbl = BurpGlobals::getSpecific();
+
+		if (m_prev != gbl)
+			BurpGlobals::restoreSpecific();
+
+		fb_assert(m_prev == BurpGlobals::getSpecific());
+	}
+
+private:
+	BurpGlobals* m_prev;
+};
+
+
 /// class BackupRelationTask
 
 BackupRelationTask::BackupRelationTask(BurpGlobals* tdgbl) : BurpTask(tdgbl),
@@ -186,8 +213,16 @@ bool BackupRelationTask::handler(WorkItem& _item)
 		m_error = true;
 		stopItems();
 	}
-	catch (const Exception&)	// could be different handlers for LongJump and Exception
+	catch (const Exception& ex)	// could be different handlers for LongJump and Exception
 	{
+		FbLocalStatus st;
+		ex.stuffException(&st);
+
+		{ // scope
+			SimpleGblHolder gbl(m_masterGbl);
+			BURP_print_status(true, &st);
+		}
+
 		m_stop = true;
 		m_error = true;
 		stopItems();
@@ -701,8 +736,16 @@ bool RestoreRelationTask::handler(WorkItem& _item)
 		m_dirtyCond.notifyAll();
 		m_cleanCond.notifyAll();
 	}
-	catch (const Exception&)	// could be different handlers for LongJump and Exception
+	catch (const Exception& ex)	// could be different handlers for LongJump and Exception
 	{
+		FbLocalStatus st;
+		ex.stuffException(&st);
+
+		{ // scope
+			SimpleGblHolder gbl(m_masterGbl);
+			BURP_print_status(true, &st);
+		}
+
 		m_stop = true;
 		m_error = true;
 		m_dirtyCond.notifyAll();

src/burp/BurpTasks.h

@@ -149,6 +149,7 @@ class WriteRelationMeta
 	bool m_batchMode;
 	bool m_batchOk;
 	ULONG m_inMsgLen;
+	ULONG m_blobCount;
 
 	// batch mode
 	Firebird::string m_sqlStatement;

src/burp/restore.epp

@@ -63,6 +63,7 @@
 #include "../common/dsc_proto.h"
 #include "../common/ThreadStart.h"
 #include "../common/msg_encode.h"
+#include "../common/classes/BatchCompletionState.h"
 
 using MsgFormat::SafeArg;
 using namespace Firebird;
@@ -2311,7 +2312,6 @@ void get_blob(BurpGlobals* tdgbl, IBatch* batch, const burp_fld* fields, UCHAR*
 	}
 
 	// Eat up blob segments
-
 	for (; segments > 0; --segments)
 	{
 		USHORT length = get(tdgbl);
@@ -11672,6 +11672,7 @@ void WriteRelationMeta::clear()
 	m_blr.clear();
 	m_inMgsNum = 0;
 	m_inMsgLen = 0;
+	m_blobCount = 0;
 }
 
 void WriteRelationMeta::setRelation(BurpGlobals* tdgbl, const burp_rel* relation)
@@ -11793,11 +11794,17 @@ IBatch* WriteRelationMeta::createBatch(BurpGlobals* tdgbl, IAttachment* att)
 			// correct batchStep if necessary
 			unsigned msgSize = m_batchMeta->getAlignedLength(&tdgbl->throwStatus);
 			if (msgSize * m_batchStep > bufSize)
+			{
 				m_batchStep = bufSize / msgSize;
+				m_blobCount++;		// looks like we are under low ram conditions on server...
+									// make batch step even smaller if we have some blobs
+			}
+			if (m_blobCount)
+				m_batchStep /= m_blobCount;
 
 			// determine maximum blob size for inline transfer
 			m_batchInlineBlobLimit = bufSize / m_batchStep;
-			// take into an account:	   blob alignment	header size
+			// take into an account:  blob alignment   header size
 			m_batchInlineBlobLimit -= ((blAlign - 1) + blHdr);
 		}
 		fb_assert(m_batchInlineBlobLimit);
@@ -11877,6 +11884,8 @@ bool WriteRelationMeta::prepareBatch(BurpGlobals* tdgbl)
 				offset = FB_ALIGN(offset, alignment);
 			field->fld_offset = offset;
 			offset += field->fld_total_len = desc.dsc_length;
+			if (desc.isBlob())
+				++m_blobCount;
 
 			SLONG sqlLength, sqlSubType, sqlScale, sqlType;
 			desc.getSqlInfo(&sqlLength, &sqlSubType, &sqlScale, &sqlType);

src/common/classes/BatchCompletionState.h

@@ -26,6 +26,8 @@
 #include "../common/classes/array.h"
 #include "../common/utils_proto.h"
 
+#define DEB_BATCH(x)
+
 namespace Firebird {
 
 	class Transliterate

src/dsql/DsqlBatch.h

@@ -29,8 +29,6 @@
 #include "../common/classes/vector.h"
 #include "../common/classes/GenericMap.h"
 
-#define DEB_BATCH(x)
-
 
 namespace Firebird {
 

src/remote/client/interface.cpp

@@ -9343,6 +9343,16 @@ static void receive_packet_noqueue(rem_port* port, PACKET* packet)
 				stmt_id = p->packet.p_sqlfree.p_sqlfree_statement;
 				bFreeStmt = (p->packet.p_sqlfree.p_sqlfree_option == DSQL_drop);
 				break;
+
+			case op_batch_blob_stream:
+				stmt_id = p->packet.p_batch_blob.p_batch_statement;
+				bCheckResponse = true;
+				break;
+
+			case op_batch_regblob:
+				stmt_id = p->packet.p_batch_regblob.p_batch_statement;
+				bCheckResponse = true;
+				break;
 			}
 
 			receive_packet_with_callback(port, &p->packet);