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

Hopefully better name in #ifdef

Browse Source
This commit is contained in:
AlexPeshkoff 2016-10-18 10:55:21 +03:00
parent 70acd97746
commit 1ba1af29f0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/blb.cpp
View File

@ -1217,7 +1217,7 @@ void blb::move(thread_db* tdbb, dsc* from_desc, dsc* to_desc, const ValueExprNod
blob->blb_relation = relation;
blob->blb_sub_type = to_desc->getBlobSubType();
blob->blb_charset = to_desc->getCharSet();
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
blob->blb_fld_id = fieldNode->fieldId;
#endif
destination->set_permanent(relation->rel_id, DPM_store_blob(tdbb, blob, record));
@ -1414,7 +1414,7 @@ blb* blb::open2(thread_db* tdbb,
blob->blb_pg_space_id = blob->blb_relation->getPages(tdbb)->rel_pg_space_id;
DPM_get_blob(tdbb, blob, blobId.get_permanent_number(), false, 0);
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
if (!blob->blb_relation->isSystem() && blob->blb_fld_id < blob->blb_relation->rel_fields->count())
{
jrd_fld* fld = (*blob->blb_relation->rel_fields)[blob->blb_fld_id];
@ -2907,7 +2907,7 @@ void blb::fromPageHeader(const Ods::blh* header)
blb_level = header->blh_level;
blb_sub_type = header->blh_sub_type;
blb_charset = header->blh_charset;
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
blb_fld_id = header->blh_fld_id;
#endif
}
@ -2922,7 +2922,7 @@ void blb::toPageHeader(Ods::blh* header) const
header->blh_level = blb_level;
header->blh_sub_type = blb_sub_type;
header->blh_charset = blb_charset;
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
header->blh_fld_id = blb_fld_id;
#endif
}

2
src/jrd/blb.h
View File

@ -157,7 +157,7 @@ private:
USHORT blb_pg_space_id; // page space
USHORT blb_fragment_size; // Residual fragment size
USHORT blb_max_segment; // Longest segment
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
USHORT blb_fld_id; // Field ID
#endif
bool blb_has_buffer;

2
src/jrd/ods.h
View File

@ -631,7 +631,7 @@ struct blh
ULONG blh_length; // Total length of data
USHORT blh_sub_type; // Blob sub-type
UCHAR blh_charset; // Blob charset (since ODS 11.1)
#ifdef CHECK_BLOB_SELECT
#ifdef CHECK_BLOB_FIELD_ACCESS_FOR_SELECT
USHORT blh_fld_id; // Field ID
#endif
UCHAR blh_unused;