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

1. introduced Jrd and Ods namespaces

Browse Source 
2. cleanup of blk* request conversions
3. fixed memory allocation in Execute Statement
This commit is contained in:
alexpeshkoff 2004-03-20 15:12:39 +00:00
parent 0e0740e46c
commit bc2d0c08b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/dpm.epp
View File

@ -79,6 +79,9 @@ DATABASE DB = FILENAME "ODS.RDB";
#define HIGH_WATER(x) ((SSHORT) sizeof (data_page) + (SSHORT) sizeof (data_page::dpg_repeat) * (x - 1)) #define HIGH_WATER(x) ((SSHORT) sizeof (data_page) + (SSHORT) sizeof (data_page::dpg_repeat) * (x - 1))
#define SPACE_FUDGE RHDF_SIZE #define SPACE_FUDGE RHDF_SIZE
using namespace Jrd;
using namespace Ods;
static void delete_tail(thread_db*, RHDF, USHORT); static void delete_tail(thread_db*, RHDF, USHORT);
static void fragment(thread_db*, record_param*, SSHORT, Dcc*, SSHORT, const jrd_tra*); static void fragment(thread_db*, record_param*, SSHORT, Dcc*, SSHORT, const jrd_tra*);
static void extend_relation(thread_db*, jrd_rel*, WIN *); static void extend_relation(thread_db*, jrd_rel*, WIN *);
@ -849,7 +852,7 @@ void DPM_delete_relation( thread_db* tdbb, jrd_rel* relation)
/* Next, cancel out stuff from RDB$PAGES */ /* Next, cancel out stuff from RDB$PAGES */
blk* handle = NULL; jrd_req* handle = NULL;
FOR(REQUEST_HANDLE handle) X IN RDB$PAGES WITH FOR(REQUEST_HANDLE handle) X IN RDB$PAGES WITH
X.RDB$RELATION_ID EQ relation->rel_id ERASE X; X.RDB$RELATION_ID EQ relation->rel_id ERASE X;
@ -1652,7 +1655,7 @@ void DPM_pages(
} }
#endif #endif
blk* request = CMP_find_request(tdbb, irq_s_pages, IRQ_REQUESTS); jrd_req* request = CMP_find_request(tdbb, irq_s_pages, IRQ_REQUESTS);
STORE(REQUEST_HANDLE request) STORE(REQUEST_HANDLE request)
X IN RDB$PAGES X.RDB$RELATION_ID = rel_id; X IN RDB$PAGES X.RDB$RELATION_ID = rel_id;
@ -1773,7 +1776,7 @@ void DPM_scan_pages( thread_db* tdbb)
CCH_RELEASE(tdbb, &window); CCH_RELEASE(tdbb, &window);
blk* request = CMP_find_request(tdbb, irq_r_pages, IRQ_REQUESTS); jrd_req* request = CMP_find_request(tdbb, irq_r_pages, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request) X IN RDB$PAGES FOR(REQUEST_HANDLE request) X IN RDB$PAGES