Restore the broken record layout optimization by gbak and extend it to the new datatypes (#8815)

* Add new 128-bit types to the record layout optimization attempted by gbak

* Given the backup file already contains fields in the optimized order, insist on it and prevent the engine from generating field IDs in a different order. This restores the original record layout optimization accidentally broken by my commit #2ed48a6.

Author: dyemanov

src/burp/backup.epp

@@ -1940,6 +1940,7 @@ void put_relation( burp_rel* relation)
 	burp_fld* unaligned = NULL;
 	burp_fld* aligned4 = NULL;
 	burp_fld* aligned8 = NULL;
+	burp_fld* aligned16 = NULL;
 
 	burp_fld* fields = get_fields(relation);
 
@@ -1951,7 +1952,13 @@ void put_relation( burp_rel* relation)
 		USHORT l = field->fld_length;
 		if (field->fld_type == blr_varying)
 			l += sizeof(USHORT);
-		if (!(l & 7))
+
+		if (!(l & 15))
+		{
+			field->fld_next = aligned16;
+			aligned16 = field;
+		}
+		else if (!(l & 7))
 		{
 			field->fld_next = aligned8;
 			aligned8 = field;
@@ -2005,6 +2012,13 @@ void put_relation( burp_rel* relation)
 		relation->rel_fields = field;
 	}
 
+	while ((field = aligned16))
+	{
+		aligned16 = field->fld_next;
+		field->fld_next = relation->rel_fields;
+		relation->rel_fields = field;
+	}
+
 	// Now write the fields in what will become physical backup order
 
 	for (field = relation->rel_fields; field; field = field->fld_next)

src/burp/restore.epp

@@ -132,7 +132,7 @@ bool	get_collation(BurpGlobals* tdgbl);
 SLONG	get_compressed(BurpGlobals* tdgbl, UCHAR* buffer, SLONG length);
 void	get_data(BurpGlobals* tdgbl, burp_rel*, WriteRelationReq* req);
 bool	get_exception(BurpGlobals* tdgbl);
-burp_fld*	get_field(BurpGlobals* tdgbl, burp_rel*);
+burp_fld*	get_field(BurpGlobals* tdgbl, burp_rel*, USHORT id);
 bool	get_field_dimensions(BurpGlobals* tdgbl);
 bool	get_files(BurpGlobals* tdgbl);
 bool	get_filter(BurpGlobals* tdgbl);
@@ -3806,7 +3806,7 @@ bool get_exception(BurpGlobals* tdgbl)
 }
 
 
-burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation)
+burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation, USHORT id)
 {
 /**************************************
  *
@@ -3865,6 +3865,9 @@ burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation)
 			// ODS 14
 			X.RDB$FIELD_SOURCE_SCHEMA_NAME.NULL = TRUE;
 
+			X.RDB$FIELD_ID.NULL = FALSE;
+			X.RDB$FIELD_ID = id;
+
 			if (relation->rel_name.schema.hasData())
 			{
 				strcpy(X.RDB$SCHEMA_NAME, relation->rel_name.schema.c_str());
@@ -4084,6 +4087,9 @@ burp_fld* get_field(BurpGlobals* tdgbl, burp_rel* relation)
 			X.RDB$NULL_FLAG.NULL = TRUE;
 			X.RDB$COLLATION_ID.NULL = TRUE;
 
+			X.RDB$FIELD_ID.NULL = FALSE;
+			X.RDB$FIELD_ID = id;
+
 			skip_init(&scan_next_attr);
 			while (get_attribute(&attribute, tdgbl) != att_end)
 			{
@@ -8249,6 +8255,7 @@ bool get_relation(BurpGlobals* tdgbl, Coordinator* coord, RestoreRelationTask* t
 	// Eat up misc. records
 	burp_fld* field = NULL;
 	burp_fld** ptr = &relation->rel_fields;
+	USHORT id = 0;
 
 	rec_type record;
 	while (get_record(&record, tdgbl) != rec_data)
@@ -8277,7 +8284,7 @@ bool get_relation(BurpGlobals* tdgbl, Coordinator* coord, RestoreRelationTask* t
 			return true;
 
 		case rec_field:
-			*ptr = field = get_field (tdgbl, relation);
+			*ptr = field = get_field(tdgbl, relation, id++);
 			if (!field)
 				return false;
 			ptr = &field->fld_next;