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

Fixed CORE-1253 - LIST(DISTINCT) concatenate VARCHAR values as CHAR

Browse Source
This commit is contained in:
asfernandes 2007-05-11 02:07:36 +00:00
parent c8e0c32095
commit c97d57013e
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/evl.cpp
View File

@ -3763,7 +3763,7 @@ static void init_agg_distinct(thread_db* tdbb, const jrd_nod* node)
const sort_key_def* sort_key = asb->asb_key_desc;
asb_impure->iasb_sort_handle =
SORT_init(tdbb, ROUNDUP_LONG(sort_key->skd_length),
SORT_init(tdbb, ROUNDUP_LONG(asb->asb_length),
1, 1, sort_key, reject_duplicate, 0, 0);
}

1
src/jrd/exe.h
View File

@ -189,6 +189,7 @@ public:
SCHAR nod_scale;
USHORT nod_count;
dsc asb_desc;
USHORT asb_length;
sort_key_def* asb_key_desc; /* for the aggregate */
UCHAR asb_key_data[1];
};

24
src/jrd/opt.cpp
View File

@ -3933,16 +3933,11 @@ static RecordSource* gen_aggregate(thread_db* tdbb, OptimizerBlk* opt, jrd_nod*
AggregateSort* asb = (AggregateSort*) PAR_make_node(tdbb, count);
asb->nod_type = nod_asb;
asb->nod_count = 0;
/* build the sort key definition. Turn varying text and
cstrings into text */
// Build the sort key definition. Turn cstrings into varying text.
CMP_get_desc(tdbb, csb, from->nod_arg[0], desc);
if (desc->dsc_dtype == dtype_varying) {
desc->dsc_dtype = dtype_text;
desc->dsc_length -= sizeof(USHORT);
}
else if (desc->dsc_dtype == dtype_cstring) {
desc->dsc_dtype = dtype_text;
desc->dsc_length--;
if (desc->dsc_dtype == dtype_cstring) {
desc->dsc_dtype = dtype_varying;
desc->dsc_length++;
}
sort_key_def* sort_key = asb->asb_key_desc = (sort_key_def*) asb->asb_key_data;
@ -3955,7 +3950,18 @@ static RecordSource* gen_aggregate(thread_db* tdbb, OptimizerBlk* opt, jrd_nod*
DSC_dtype_tostring(desc->dsc_dtype),
0);
}
sort_key->skd_length = desc->dsc_length;
if (desc->dsc_dtype == dtype_varying)
{
// allocate space to store varying length
sort_key->skd_vary_offset = ROUNDUP(desc->dsc_length, sizeof(SLONG));
asb->asb_length = sort_key->skd_vary_offset + sizeof(USHORT);
}
else
asb->asb_length = sort_key->skd_length;
sort_key->skd_flags = SKD_ascending;
asb->nod_impure = CMP_impure(csb, sizeof(impure_agg_sort));
asb->asb_desc = *desc;