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

Code simplification

Browse Source
This commit is contained in:
Dmitry Yemanov 2022-04-03 11:26:55 +03:00
parent 2d0ffb75f3
commit bb77ba2644
2 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/jrd/optimizer/Optimizer.cpp
View File

@ -1335,17 +1335,13 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
if (SortedStream::hasVolatileKey(desc) && !refetchFlag)
sort_key->skd_flags |= SKD_separate_data;
map_item->clear();
map_item->node = node;
map_item->flagOffset = prev_key->getSkdOffset();
map_item->reset(node, prev_key->getSkdOffset());
map_item->desc = *desc;
map_item->desc.dsc_address = (UCHAR*)(IPTR) sort_key->getSkdOffset();
prev_key = sort_key++;
FieldNode* fieldNode;
if ( (fieldNode = nodeAs<FieldNode>(node)) )
if (const auto fieldNode = nodeAs<FieldNode>(node))
{
map_item->stream = fieldNode->fieldStream;
map_item->fieldId = fieldNode->fieldId;
@ -1368,10 +1364,7 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
if (item.desc->dsc_dtype >= dtype_aligned)
map_length = FB_ALIGN(map_length, type_alignments[item.desc->dsc_dtype]);
map_item->clear();
map_item->fieldId = (SSHORT) item.id;
map_item->stream = item.stream;
map_item->flagOffset = flag_offset++;
map_item->reset(item.stream, (SSHORT) item.id, flag_offset++);
map_item->desc = *item.desc;
map_item->desc.dsc_address = (UCHAR*)(IPTR) map_length;
map_length += item.desc->dsc_length;
@ -1383,24 +1376,14 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
map_length = ROUNDUP(map_length, sizeof(SINT64));
for (const auto stream : streams)
{
map_item->clear();
map_item->fieldId = SortedStream::ID_DBKEY;
map_item->stream = stream;
dsc* desc = &map_item->desc;
desc->dsc_dtype = dtype_int64;
desc->dsc_length = sizeof(SINT64);
desc->dsc_address = (UCHAR*)(IPTR) map_length;
map_length += desc->dsc_length;
map_item->reset(stream, SortedStream::ID_DBKEY);
map_item->desc.makeInt64(0, (SINT64*)(IPTR) map_length);
map_length += map_item->desc.dsc_length;
map_item++;
map_item->clear();
map_item->fieldId = SortedStream::ID_TRANS;
map_item->stream = stream;
desc = &map_item->desc;
desc->dsc_dtype = dtype_int64;
desc->dsc_length = sizeof(SINT64);
desc->dsc_address = (UCHAR*)(IPTR) map_length;
map_length += desc->dsc_length;
map_item->reset(stream, SortedStream::ID_TRANS);
map_item->desc.makeInt64(0, (SINT64*)(IPTR) map_length);
map_length += map_item->desc.dsc_length;
map_item++;
}
@ -1410,43 +1393,26 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
for (const auto stream : *dbkeyStreams)
{
map_item->clear();
map_item->fieldId = SortedStream::ID_DBKEY;
map_item->stream = stream;
dsc* desc = &map_item->desc;
desc->dsc_dtype = dtype_int64;
desc->dsc_length = sizeof(SINT64);
desc->dsc_address = (UCHAR*)(IPTR) map_length;
map_length += desc->dsc_length;
map_item->reset(stream, SortedStream::ID_DBKEY);
map_item->desc.makeInt64(0, (SINT64*)(IPTR) map_length);
map_length += map_item->desc.dsc_length;
map_item++;
}
for (const auto stream : *dbkeyStreams)
{
map_item->clear();
map_item->fieldId = SortedStream::ID_DBKEY_VALID;
map_item->stream = stream;
dsc* desc = &map_item->desc;
desc->dsc_dtype = dtype_text;
desc->dsc_ttype() = CS_BINARY;
desc->dsc_length = 1;
desc->dsc_address = (UCHAR*)(IPTR) map_length;
map_length += desc->dsc_length;
map_item->reset(stream, SortedStream::ID_DBKEY_VALID);
map_item->desc.makeText(1, CS_BINARY, (UCHAR*)(IPTR) map_length);
map_length += map_item->desc.dsc_length;
map_item++;
}
}
for (const auto stream : streams)
{
map_item->clear();
map_item->fieldId = SortedStream::ID_DBKEY_VALID;
map_item->stream = stream;
dsc* desc = &map_item->desc;
desc->dsc_dtype = dtype_text;
desc->dsc_ttype() = CS_BINARY;
desc->dsc_length = 1;
desc->dsc_address = (UCHAR*)(IPTR) map_length;
map_length += desc->dsc_length;
map_item->reset(stream, SortedStream::ID_DBKEY_VALID);
map_item->desc.makeText(1, CS_BINARY, (UCHAR*)(IPTR) map_length);
map_length += map_item->desc.dsc_length;
map_item++;
}

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

@ -546,12 +546,21 @@ namespace Jrd
public:
struct Item
{
void clear()
void reset(NestConst<ValueExprNode> _node, ULONG _flagOffset = 0)
{
desc.clear();
flagOffset = fieldId = 0;
stream = 0;
node = NULL;
stream = fieldId = 0;
node = _node;
flagOffset = _flagOffset;
}
void reset(StreamType _stream, SSHORT _fieldId, ULONG _flagOffset = 0)
{
desc.clear();
node = nullptr;
stream = _stream;
fieldId = _fieldId;
flagOffset = _flagOffset;
}
StreamType stream; // stream for field id