Skip to content

Commit 1dbcb94

Browse files
committed
Fixed bug #7974 : Restore of wide table can fail with "adjusting an invalid decompression length from <N> to <M>"
Commented out wrong assert.
1 parent bcc53d4 commit 1dbcb94

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/burp/restore.epp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12292,7 +12292,7 @@ bool RestoreRelationTask::fileReader(Item& item)
1229212292

1229312293
BURP_verbose(124, m_relation->rel_name); // msg 124 restoring data for relation %s
1229412294

12295-
const ULONG length = m_metadata.m_inMsgLen; // full record length
12295+
const RCRD_LENGTH length = m_metadata.m_inMsgLen; // full record length
1229612296

1229712297
IOBuffer* ioBuf = NULL;
1229812298
FB_SSIZE_T space = 0; // space left in current buffer
@@ -12310,7 +12310,7 @@ bool RestoreRelationTask::fileReader(Item& item)
1231012310
if (get(tdgbl) != att_data_length)
1231112311
BURP_error_redirect(NULL, 39); // msg 39 expected record length
1231212312

12313-
USHORT len = (USHORT) get_int32(tdgbl);
12313+
RCRD_LENGTH len = get_int32(tdgbl);
1231412314

1231512315
if (!tdgbl->gbl_sw_transportable && len != length)
1231612316
{
@@ -12324,7 +12324,7 @@ bool RestoreRelationTask::fileReader(Item& item)
1232412324
BURP_error_redirect(NULL, 55);
1232512325
// msg 55 Expected XDR record length
1232612326
else
12327-
len = (USHORT) get_int32(tdgbl);
12327+
len = get_int32(tdgbl);
1232812328
}
1232912329

1233012330
if (get(tdgbl) != att_data_data)

src/jrd/dpm.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3807,7 +3807,7 @@ static void store_big_record(thread_db* tdbb,
38073807
// What's left fits on a page. Store it somewhere.
38083808

38093809
const auto inLength = in - rpb->rpb_address;
3810-
fb_assert(Compressor(tdbb, inLength, rpb->rpb_address).getPackedLength() == size);
3810+
// fb_assert(Compressor(tdbb, inLength, rpb->rpb_address).getPackedLength() == size);
38113811

38123812
stack.push(prior);
38133813

0 commit comments

Comments
 (0)