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

Backport fix for bug CORE-2977 : FB 2.1 incorrectly works with indexed fields of type DATE in OLD ODS (9.1)

Browse Source
This commit is contained in:
hvlad 2012-01-24 12:06:32 +00:00
parent 4a471e6127
commit ca042283e1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jrd/btr.cpp
View File

@ -1301,6 +1301,7 @@ USHORT BTR_key_length(thread_db* tdbb, jrd_rel* relation, index_desc* idx)
switch (tail->idx_itype)
{
case idx_numeric:
case idx_timestamp1:
length = sizeof(double);
break;
@ -1354,6 +1355,7 @@ USHORT BTR_key_length(thread_db* tdbb, jrd_rel* relation, index_desc* idx)
switch (tail->idx_itype)
{
case idx_numeric:
case idx_timestamp1:
length = sizeof(double);
break;
case idx_sql_time:
@ -2450,6 +2452,7 @@ static void compress(thread_db* tdbb,
switch (itype)
{
case idx_numeric:
case idx_timestamp1:
length = sizeof(double);
break;
case idx_sql_time:
@ -2576,6 +2579,13 @@ static void compress(thread_db* tdbb,
#ifdef DEBUG_INDEXKEY
fprintf(stderr, "NUMERIC %lg ", temp.temp_double);
#endif
}
else if (itype == idx_timestamp1) {
temp.temp_double = MOV_date_to_double(desc);
temp_is_negative = (temp.temp_double < 0);
#ifdef DEBUG_INDEXKEY
fprintf(stderr, "TIMESTAMP1 %lg ", temp.temp_double);
#endif
}
else if (itype == idx_numeric2) {

2
src/jrd/btr.h
View File

@ -96,7 +96,7 @@ struct IndexDescAlloc : public pool_alloc_rpt<index_desc> {
const int idx_numeric = 0;
const int idx_string = 1;
// AB: idx_timestamp1 removed
const int idx_timestamp1 = 2;
const int idx_byte_array = 3;
const int idx_metadata = 4;
const int idx_sql_date = 5;