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

Get rid of alloca usage

Browse Source
This commit is contained in:
skidder 2003-08-19 12:49:33 +00:00
parent 8dbb370c01
commit 27ebbfe696
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/opt.cpp
View File

@ -45,7 +45,6 @@
#include "firebird.h" #include "firebird.h"
#include "../jrd/ib_stdio.h" #include "../jrd/ib_stdio.h"
#include <string.h> #include <string.h>
#include <malloc.h>
#include "../jrd/gds.h" #include "../jrd/gds.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/align.h" #include "../jrd/align.h"
@ -78,6 +77,7 @@
#include "../jrd/thd_proto.h" #include "../jrd/thd_proto.h"
#include "../jrd/gds_proto.h" #include "../jrd/gds_proto.h"
#include "../jrd/dbg_proto.h" #include "../jrd/dbg_proto.h"
#include "../common/classes/array.h"
#ifdef DEV_BUILD #ifdef DEV_BUILD
#define OPT_DEBUG #define OPT_DEBUG
@ -6392,7 +6392,7 @@ static void sort_indices_by_selectivity(csb_repeat * csb_tail)
***************************************************/ ***************************************************/
IDX *idx, *selected_idx = NULL; IDX *idx, *selected_idx = NULL;
USHORT i, j; USHORT i, j;
IDX *idx_sort = (IDX*)alloca(csb_tail->csb_indices*sizeof(IDX)); Firebird::Array<IDX> idx_sort(GET_THREAD_DATA->tdbb_default, csb_tail->csb_indices);
float selectivity; float selectivity;
BOOLEAN same_selectivity; BOOLEAN same_selectivity;
@ -6436,7 +6436,7 @@ static void sort_indices_by_selectivity(csb_repeat * csb_tail)
} }
} }
selected_idx->idx_runtime_flags |= idx_marker; selected_idx->idx_runtime_flags |= idx_marker;
MOVE_FAST(selected_idx, &idx_sort[j], sizeof(IDX)); idx_sort.add(*selected_idx);
} }
// Finally store the right order in cbs_tail->csb_idx // Finally store the right order in cbs_tail->csb_idx