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

Misc.

Browse Source
This commit is contained in:
asfernandes 2012-01-22 01:10:58 +00:00
parent 540da0d53f
commit 8d5413ee98
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/btr.cpp
View File

@ -1117,6 +1117,10 @@ idx_e BTR_key(thread_db* tdbb, jrd_rel* relation, Record* record, index_desc* id
try { try {
const USHORT keyType = fuzzy ?
INTL_KEY_PARTIAL :
((idx->idx_flags & idx_unique) ? INTL_KEY_UNIQUE : INTL_KEY_SORT);
// Special case single segment indices // Special case single segment indices
if (idx->idx_count == 1) if (idx->idx_count == 1)
@ -1157,10 +1161,6 @@ idx_e BTR_key(thread_db* tdbb, jrd_rel* relation, Record* record, index_desc* id
if (!isNull) if (!isNull)
key->key_flags &= ~key_all_nulls; key->key_flags &= ~key_all_nulls;
const USHORT keyType = fuzzy ?
INTL_KEY_PARTIAL :
((idx->idx_flags & idx_unique) ? INTL_KEY_UNIQUE : INTL_KEY_SORT);
compress(tdbb, desc_ptr, key, tail->idx_itype, isNull, compress(tdbb, desc_ptr, key, tail->idx_itype, isNull,
(idx->idx_flags & idx_descending), keyType); (idx->idx_flags & idx_descending), keyType);
} }
@ -1199,10 +1199,6 @@ idx_e BTR_key(thread_db* tdbb, jrd_rel* relation, Record* record, index_desc* id
key->key_flags &= ~key_all_nulls; key->key_flags &= ~key_all_nulls;
} }
const USHORT keyType = fuzzy ?
INTL_KEY_PARTIAL :
((idx->idx_flags & idx_unique) ? INTL_KEY_UNIQUE : INTL_KEY_SORT);
compress(tdbb, desc_ptr, &temp, tail->idx_itype, isNull, compress(tdbb, desc_ptr, &temp, tail->idx_itype, isNull,
(idx->idx_flags & idx_descending), keyType); (idx->idx_flags & idx_descending), keyType);