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

Fixed comparison of strings with different number of trailing spaces.

Browse Source
This commit is contained in:
dimitr 2010-01-22 10:25:47 +00:00
parent b44620ad66
commit 2f09eb79ca
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/jrd/recsrc/HashJoin.cpp
View File

@ -24,6 +24,7 @@
#include "../jrd/common.h"
#include "../jrd/jrd.h"
#include "../jrd/req.h"
#include "../jrd/intl.h"
#include "../jrd/cmp_proto.h"
#include "../jrd/evl_proto.h"
#include "../jrd/mov_proto.h"
@ -387,12 +388,15 @@ size_t HashJoin::hashKeys(thread_db* tdbb, jrd_req* request, HashTable* table, j
for (size_t i = 0; i < keys->nod_count; i++)
{
const dsc* const desc = EVL_expr(tdbb, keys->nod_arg[i]);
fb_assert(!desc->isBlob());
if (desc && !(request->req_flags & req_null))
{
size_t length = desc->dsc_length;
const UCHAR* address = desc->dsc_address;
// Adjust the data length to the real string length
if (desc->dsc_dtype == dtype_varying)
{
const vary* const string = (vary*) address;
@ -404,6 +408,23 @@ size_t HashJoin::hashKeys(thread_db* tdbb, jrd_req* request, HashTable* table, j
length = strlen((char*) address);
}
// Adjust the data length to ignore trailing spaces
if (desc->isText())
{
CHARSET_ID charset = desc->getCharSet();
if (charset == ttype_dynamic)
{
charset = tdbb->getCharSet();
}
const UCHAR space = (charset == ttype_binary) ? '\0' : ' ';
const UCHAR* ptr = address + length;
while (length && *--ptr == space)
{
length--;
}
}
hash_slot ^= table->hash(address, length);
}
}