firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:03:02 +01:00
Code Issues

Frontported CORE-6089/6090 and minor adjustments

Browse Source
This commit is contained in:
Dmitry Yemanov 2019-06-30 21:23:37 +03:00
parent ffa93415b0
commit 78b68a3d2f
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dsql/ExprNodes.cpp
View File

@ -3560,9 +3560,6 @@ dsc* CastNode::execute(thread_db* tdbb, jrd_req* request) const
if (!value) if (!value)
return NULL; return NULL;
if (DTYPE_IS_BLOB(value->dsc_dtype) || DTYPE_IS_BLOB(impure->vlu_desc.dsc_dtype))
blb::move(tdbb, value, &impure->vlu_desc);
else
MOV_move(tdbb, value, &impure->vlu_desc); MOV_move(tdbb, value, &impure->vlu_desc);
if (impure->vlu_desc.dsc_dtype == dtype_text) if (impure->vlu_desc.dsc_dtype == dtype_text)

2
src/jrd/exe.cpp
View File

@ -395,7 +395,7 @@ void EXE_assignment(thread_db* tdbb, const ValueExprNode* to, dsc* from_desc, bo
if (DTYPE_IS_BLOB_OR_QUAD(from_desc->dsc_dtype) || DTYPE_IS_BLOB_OR_QUAD(to_desc->dsc_dtype)) if (DTYPE_IS_BLOB_OR_QUAD(from_desc->dsc_dtype) || DTYPE_IS_BLOB_OR_QUAD(to_desc->dsc_dtype))
{ {
// ASF: Don't let MOV_move call blb::move because MOV // ASF: Don't let MOV_move call blb::move because MOV
// will not pass the destination field to blb::_move. // will not pass the destination field to blb::move.
record_param* rpb = NULL; record_param* rpb = NULL;
USHORT fieldId = 0; USHORT fieldId = 0;

23
src/jrd/vio.cpp
View File

@ -1257,6 +1257,15 @@ void VIO_copy_record(thread_db* tdbb, record_param* org_rpb, record_param* new_r
Record* const new_record = new_rpb->rpb_record; Record* const new_record = new_rpb->rpb_record;
fb_assert(org_record && new_record); fb_assert(org_record && new_record);
// dimitr: Clear the req_null flag that may stay active after the last
// boolean evaluation. Here we use only EVL_field() calls that
// do not touch this flag and data copying is done only for
// non-NULL fields, so req_null should never be seen inside blb::move().
// See CORE-6090 for details.
jrd_req* const request = tdbb->getRequest();
request->req_flags &= ~req_null;
// Copy the original record to the new record. If the format hasn't changed, // Copy the original record to the new record. If the format hasn't changed,
// this is a simple move. If the format has changed, each field must be // this is a simple move. If the format has changed, each field must be
// fetched and moved separately, remembering to set the missing flag. // fetched and moved separately, remembering to set the missing flag.
@ -1275,8 +1284,18 @@ void VIO_copy_record(thread_db* tdbb, record_param* org_rpb, record_param* new_r
{ {
if (EVL_field(org_rpb->rpb_relation, org_record, i, &org_desc)) if (EVL_field(org_rpb->rpb_relation, org_record, i, &org_desc))
{ {
if (DTYPE_IS_BLOB_OR_QUAD(org_desc.dsc_dtype) || DTYPE_IS_BLOB_OR_QUAD(new_desc.dsc_dtype)) // If the source is not a blob or it's a temporary blob,
Jrd::blb::move(tdbb, &org_desc, &new_desc, new_rpb, i); // then we'll need to materialize the resulting blob.
// Thus blb::move() is called with rpb and field ID.
// See also CORE-5600.
const bool materialize =
(DTYPE_IS_BLOB_OR_QUAD(new_desc.dsc_dtype) &&
!(DTYPE_IS_BLOB_OR_QUAD(org_desc.dsc_dtype) &&
((bid*) org_desc.dsc_address)->bid_internal.bid_relation_id));
if (materialize)
blb::move(tdbb, &org_desc, &new_desc, new_rpb, i);
else else
MOV_move(tdbb, &org_desc, &new_desc); MOV_move(tdbb, &org_desc, &new_desc);
} }