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

Misc

Browse Source
This commit is contained in:
asfernandes 2010-01-12 14:21:30 +00:00
parent c97593ec8f
commit 5277b99bcf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jrd/opt.cpp
View File

@ -3526,8 +3526,7 @@ static bool gen_sort_merge(thread_db* tdbb, OptimizerBlk* opt, RiverStack& org_r
jrd_nod* node = tail->opt_conjunct_node;
if (node->nod_type != nod_eql &&
node->nod_type != nod_equiv)
if (node->nod_type != nod_eql && node->nod_type != nod_equiv)
{
continue;
}

8
src/jrd/recsrc/RecordSource.h
View File

@ -753,7 +753,7 @@ namespace Jrd
static const size_t HASH_SIZE = 1009;
typedef Firebird::Array<FB_UINT64> CollisionList;
struct Impure: public RecordSource::Impure
struct Impure : public RecordSource::Impure
{
CollisionList* irsb_hash_table[HASH_SIZE];
USHORT irsb_hash_slot;
@ -785,13 +785,13 @@ namespace Jrd
USHORT hashKeys(thread_db* tdbb, jrd_req* request, bool outer);
bool compareKeys(thread_db* tdbb, jrd_req* request);
const bool m_outerJoin;
const bool m_semiJoin;
const bool m_antiJoin;
RecordSource* const m_outer;
BufferedStream* const m_inner;
const jrd_nod* const m_outerKeys;
const jrd_nod* const m_innerKeys;
const bool m_outerJoin;
const bool m_semiJoin;
const bool m_antiJoin;
};
class MergeJoin : public RecordSource