Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/jrd btr.cpp,1.45,1.46 btr.h,1.17,1.18 btr_proto.h,1.14,1.15 dfw.epp,1.71,1.72 dfw_proto.h,1.8,1.9 idx.cpp,1.30,1.31 idx_proto.h,1.10,1.11 irq.h,1.4,1.5 pcmet.epp,1.7,1.8
|
From: Dmitry Y. <di...@us...> - 2003-11-30 21:13:08
|
Build Version : T2.0.0.5934 Firebird 2.0 UNSTABLE
(writeBuildNum.sh,v 1.5934 2003/11/30 21:13:04 dimitr Exp $ )
Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1:/tmp/cvs-serv570
Modified Files:
btr.cpp btr.h btr_proto.h dfw.epp dfw_proto.h idx.cpp
idx_proto.h irq.h pcmet.epp
Log Message:
Let's support segment-level selectivities. Amen.
Index: btr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/btr.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -U3 -r1.45 -r1.46
--- btr.cpp 11 Nov 2003 12:12:17 -0000 1.45
+++ btr.cpp 30 Nov 2003 21:13:03 -0000 1.46
@@ -160,7 +160,7 @@
static CONTENTS delete_node(TDBB, WIN *, BTN);
static void delete_tree(TDBB, USHORT, USHORT, SLONG, SLONG);
static DSC *eval(TDBB, JRD_NOD, DSC *, bool *);
-static SLONG fast_load(TDBB, JRD_REL, IDX *, USHORT, SCB, float *);
+static SLONG fast_load(TDBB, JRD_REL, IDX *, USHORT, SCB, SelectivityList&);
static IRT fetch_root(TDBB, WIN *, JRD_REL);
static SLONG find_node(BTR, KEY *, bool);
static CONTENTS garbage_collect(TDBB, WIN *, SLONG);
@@ -241,7 +241,9 @@
void BTR_create(TDBB tdbb,
JRD_REL relation,
IDX * idx,
- USHORT key_length, SCB sort_handle, float *selectivity)
+ USHORT key_length,
+ SCB sort_handle,
+ SelectivityList& selectivity)
{
/**************************************
*
@@ -270,7 +272,7 @@
IRT root = (IRT) CCH_FETCH(tdbb, &window, LCK_write, pag_root);
CCH_MARK(tdbb, &window);
root->irt_rpt[idx->idx_id].irt_root = idx->idx_root;
- root->irt_rpt[idx->idx_id].irt_stuff.irt_selectivity = *selectivity;
+ root->irt_rpt[idx->idx_id].irt_stuff.irt_selectivity = selectivity.back();
root->irt_rpt[idx->idx_id].irt_flags &= ~irt_in_progress;
if (dbb->dbb_wal) {
@@ -1573,7 +1575,7 @@
}
-float BTR_selectivity(TDBB tdbb, JRD_REL relation, USHORT id)
+void BTR_selectivity(TDBB tdbb, JRD_REL relation, USHORT id, SelectivityList& selectivity)
{
/**************************************
*
@@ -1596,13 +1598,13 @@
IRT root = fetch_root(tdbb, &window, relation);
if (!root) {
- return 0.0;
+ return;
}
SLONG page = root->irt_rpt[id].irt_root;
if (root->irt_count <= id || !page) {
CCH_RELEASE(tdbb, &window);
- return 0.0;
+ return;
}
window.win_flags = WIN_large_scan;
window.win_scans = 1;
@@ -1667,15 +1669,16 @@
CCH_RELEASE_TAIL(tdbb, &window);
// calculate the selectivity and store it on the root page
- float selectivity = (float) ((nodes) ? 1.0 / (float) (nodes - duplicates) : 0.0);
+ const USHORT count = root->irt_rpt[id].irt_keys;
+ selectivity.grow(count);
+ selectivity.back() =
+ (float) ((nodes) ? 1.0 / (float) (nodes - duplicates) : 0.0);
window.win_page = relation->rel_index_root;
window.win_flags = 0;
root = (IRT) CCH_FETCH(tdbb, &window, LCK_write, pag_root);
CCH_MARK(tdbb, &window);
- root->irt_rpt[id].irt_stuff.irt_selectivity = selectivity;
+ root->irt_rpt[id].irt_stuff.irt_selectivity = selectivity.back();
CCH_RELEASE(tdbb, &window);
-
- return selectivity;
}
@@ -2449,7 +2452,9 @@
static SLONG fast_load(TDBB tdbb,
JRD_REL relation,
IDX * idx,
- USHORT key_length, SCB sort_handle, float *selectivity)
+ USHORT key_length,
+ SCB sort_handle,
+ SelectivityList& selectivity)
{
/**************************************
*
@@ -2794,7 +2799,9 @@
}
CCH_flush(tdbb, (USHORT) FLUSH_ALL, 0);
- *selectivity = (float) ((count) ? (1. / (double) (count - duplicates)) : 0);
+ selectivity.grow(idx->idx_count);
+ selectivity.back() =
+ (float) ((count) ? (1. / (double) (count - duplicates)) : 0);
return window->win_page;
Index: btr.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/btr.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -U3 -r1.17 -r1.18
--- btr.h 30 Nov 2003 19:13:41 -0000 1.17
+++ btr.h 30 Nov 2003 21:13:03 -0000 1.18
@@ -27,12 +27,11 @@
#ifndef JRD_BTR_H
#define JRD_BTR_H
+#include "../common/classes/array.h"
#include "../jrd/jrd_blks.h"
#include "../jrd/constants.h"
#include "../include/fb_blk.h"
-#include <vector>
-
#include "../jrd/err_proto.h" /* Index error types */
/* 64 turns out not to be enough indexes */
@@ -208,6 +207,8 @@
#define LAST_NODE(page) (BTN) ((UCHAR*) page + page->btr_length)
#define NEXT_EXPANDED(xxx,yyy) (BTX) ((UCHAR*) xxx->btx_data + (yyy)->btn_prefix + (yyy)->btn_length)
+
+typedef Firebird::HalfStaticArray<float, 1> SelectivityList;
#endif /* JRD_BTR_H */
Index: btr_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/btr_proto.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -U3 -r1.14 -r1.15
--- btr_proto.h 7 Nov 2003 08:06:03 -0000 1.14
+++ btr_proto.h 30 Nov 2003 21:13:03 -0000 1.15
@@ -29,7 +29,7 @@
#include "../jrd/req.h"
USHORT BTR_all(TDBB, jrd_rel*, idx**, idx**, str**, SLONG*);
-void BTR_create(TDBB, jrd_rel*, idx*, USHORT, scb*, float*);
+void BTR_create(TDBB, jrd_rel*, idx*, USHORT, scb*, SelectivityList&);
void BTR_delete_index(TDBB, win*, USHORT);
bool BTR_description(JRD_REL, irt*, idx*, SSHORT);
void BTR_evaluate(tdbb*, irb*, sbm**);
@@ -47,7 +47,7 @@
btn* BTR_previous_node(btn*, btx**);
void BTR_remove(tdbb*, win*, iib*);
void BTR_reserve_slot(TDBB, jrd_rel*, jrd_tra*, idx*);
-float BTR_selectivity(TDBB, jrd_rel*, USHORT);
+void BTR_selectivity(TDBB, jrd_rel*, USHORT, SelectivityList&);
#endif // JRD_BTR_PROTO_H
Index: dfw.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/dfw.epp,v
retrieving revision 1.71
retrieving revision 1.72
diff -b -U3 -r1.71 -r1.72
--- dfw.epp 11 Nov 2003 12:12:17 -0000 1.71
+++ dfw.epp 30 Nov 2003 21:13:03 -0000 1.72
@@ -682,7 +682,7 @@
}
-void DFW_update_index( DFW work, USHORT id, float selectivity)
+void DFW_update_index(const TEXT* name, USHORT id, const SelectivityList& selectivity)
{
/**************************************
*
@@ -702,15 +702,35 @@
tdbb = GET_THREAD_DATA;
dbb = tdbb->tdbb_database;
+ if (dbb->dbb_ods_version >= ODS_VERSION11) {
+
+ request = (BLK) CMP_find_request(tdbb, irq_m_index_seg, IRQ_REQUESTS);
+
+ FOR(REQUEST_HANDLE request)
+ SEG IN RDB$INDEX_SEGMENTS WITH SEG.RDB$INDEX_NAME EQ name
+ SORTED BY SEG.RDB$FIELD_POSITION
+ if (!REQUEST(irq_m_index_seg))
+ REQUEST(irq_m_index_seg) = (BLK)request;
+ MODIFY SEG USING
+ SEG.RDB$STATISTICS =
+ selectivity.getCount() ? selectivity[SEG.RDB$FIELD_POSITION] : 0.0;
+ END_MODIFY;
+ END_FOR;
+
+ if (!REQUEST(irq_m_index_seg))
+ REQUEST(irq_m_index_seg) = (BLK)request;
+ }
+
request = (BLK) CMP_find_request(tdbb, irq_m_index, IRQ_REQUESTS);
FOR(REQUEST_HANDLE request)
- IDX IN RDB$INDICES WITH IDX.RDB$INDEX_NAME EQ work->dfw_name
+ IDX IN RDB$INDICES WITH IDX.RDB$INDEX_NAME EQ name
if (!REQUEST(irq_m_index))
REQUEST(irq_m_index) = (BLK)request;
MODIFY IDX USING
IDX.RDB$INDEX_ID = id + 1;
- IDX.RDB$STATISTICS = selectivity;
+ IDX.RDB$STATISTICS =
+ selectivity.getCount() ? selectivity.back() : 0.0;
END_MODIFY;
END_FOR;
@@ -1502,7 +1522,6 @@
JRD_REL relation, partner_relation;
IDX idx;
int key_count;
- float selectivity;
SSHORT text_type;
SSHORT collate;
BLK handle;
@@ -1597,12 +1616,11 @@
}
if (IDX.RDB$INDEX_ID && IDX.RDB$STATISTICS < 0.0)
{
- MODIFY IDX
- IDX.RDB$STATISTICS =
- IDX_statistics( tdbb,
- relation,
- (USHORT)(IDX.RDB$INDEX_ID - 1));
- END_MODIFY;
+ SelectivityList selectivity(tdbb->tdbb_default);
+ const USHORT id = IDX.RDB$INDEX_ID - 1;
+ IDX_statistics(tdbb, relation, id, selectivity);
+ DFW_update_index(work->dfw_name, id, selectivity);
+
EXE_unwind(tdbb, (JRD_REQ)request);
return false;
}
@@ -1782,15 +1800,11 @@
}
fb_assert(work->dfw_id == dbb->dbb_max_idx);
- IDX_create_index( tdbb,
- relation,
- &idx,
- (UCHAR*) work->dfw_name,
- &work->dfw_id,
- transaction,
- &selectivity);
+ SelectivityList selectivity(tdbb->tdbb_default);
+ IDX_create_index(tdbb, relation, &idx, (UCHAR*) work->dfw_name,
+ &work->dfw_id, transaction, selectivity);
fb_assert(work->dfw_id == idx.idx_id);
- DFW_update_index(work, idx.idx_id, selectivity);
+ DFW_update_index(work->dfw_name, idx.idx_id, selectivity);
if (partner_relation)
{
Index: dfw_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/dfw_proto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -U3 -r1.8 -r1.9
--- dfw_proto.h 7 Nov 2003 08:06:04 -0000 1.8
+++ dfw_proto.h 30 Nov 2003 21:13:03 -0000 1.9
@@ -32,6 +32,6 @@
void DFW_perform_post_commit_work(jrd_tra*);
dfw* DFW_post_work(jrd_tra*, enum dfw_t, dsc*, USHORT);
void DFW_post_work_arg(jrd_tra*, dfw*, dsc*, USHORT);
-void DFW_update_index(dfw*, USHORT, float);
+void DFW_update_index(const TEXT*, USHORT, const SelectivityList&);
#endif // JRD_DFW_PROTO_H
Index: idx.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/idx.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -U3 -r1.30 -r1.31
--- idx.cpp 11 Nov 2003 12:13:37 -0000 1.30
+++ idx.cpp 30 Nov 2003 21:13:03 -0000 1.31
@@ -169,7 +169,9 @@
JRD_REL relation,
IDX * idx,
UCHAR * index_name,
- USHORT * index_id, JRD_TRA transaction, float *selectivity)
+ USHORT * index_id,
+ JRD_TRA transaction,
+ SelectivityList& selectivity)
{
/**************************************
*
@@ -791,7 +793,7 @@
}
-float IDX_statistics(TDBB tdbb, JRD_REL relation, USHORT id)
+void IDX_statistics(TDBB tdbb, JRD_REL relation, USHORT id, SelectivityList& selectivity)
{
/**************************************
*
@@ -807,7 +809,7 @@
SET_TDBB(tdbb);
- return BTR_selectivity(tdbb, relation, id);
+ BTR_selectivity(tdbb, relation, id, selectivity);
}
Index: idx_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/idx_proto.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -U3 -r1.10 -r1.11
--- idx_proto.h 30 Nov 2003 19:13:41 -0000 1.10
+++ idx_proto.h 30 Nov 2003 21:13:03 -0000 1.11
@@ -32,7 +32,7 @@
void IDX_check_access(TDBB, class Csb *, struct jrd_rel *, struct jrd_rel *,
struct jrd_fld *);
void IDX_create_index(TDBB, struct jrd_rel *, struct idx *, UCHAR *,
- USHORT *, class jrd_tra *, float *);
+ USHORT *, class jrd_tra *, SelectivityList&);
struct idb *IDX_create_index_block(TDBB, struct jrd_rel *, USHORT);
void IDX_delete_index(TDBB, struct jrd_rel *, USHORT);
void IDX_delete_indices(TDBB, struct jrd_rel *);
@@ -45,7 +45,7 @@
enum idx_e IDX_modify_check_constraints(TDBB, struct rpb *, struct rpb *,
class jrd_tra *, struct jrd_rel **,
USHORT *);
-float IDX_statistics(TDBB, struct jrd_rel *, USHORT);
+void IDX_statistics(TDBB, struct jrd_rel *, USHORT, SelectivityList&);
enum idx_e IDX_store(struct tdbb *, struct rpb *, class jrd_tra *,
struct jrd_rel **, USHORT *);
Index: irq.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/irq.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- irq.h 3 Oct 2003 01:46:53 -0000 1.4
+++ irq.h 30 Nov 2003 21:13:03 -0000 1.5
@@ -108,7 +108,8 @@
#define irq_r_gen_id_num 72 /* lookup generator by ID. */
#define irq_verify_role_name 73 /* ensure role exists in roles & user_privileges. */
#define irq_l_relation_defsec 74 /* check the default sec class name against rel. */
+#define irq_m_index_seg 75 /* modify per-segment index selectivity */
-#define irq_MAX 75
+#define irq_MAX 76
#endif /* JRD_IRQ_H */
Index: pcmet.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/pcmet.epp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -U3 -r1.7 -r1.8
--- pcmet.epp 8 Nov 2003 16:40:16 -0000 1.7
+++ pcmet.epp 30 Nov 2003 21:13:03 -0000 1.8
@@ -70,7 +70,6 @@
DBB dbb;
JRD_REL relation;
IDX idx;
- float selectivity;
PLB default_pool, new_pool = NULL;
CSB csb;
JRD_REQ current_request;
@@ -101,12 +100,13 @@
relation->rel_name =
MET_save_name(tdbb, REL.RDB$RELATION_NAME);
relation->rel_length = strlen(relation->rel_name);
- } if (IDX.RDB$INDEX_ID && IDX.RDB$STATISTICS < 0.0) {
- MODIFY IDX
- IDX.RDB$STATISTICS =
- IDX_statistics(tdbb, relation,
- IDX.RDB$INDEX_ID - 1);
- END_MODIFY;
+ }
+ if (IDX.RDB$INDEX_ID && IDX.RDB$STATISTICS < 0.0) {
+ SelectivityList selectivity(tdbb->tdbb_default);
+ const USHORT id = IDX.RDB$INDEX_ID - 1;
+ IDX_statistics(tdbb, relation, id, selectivity);
+ DFW_update_index(work->dfw_name, id, selectivity);
+
EXE_unwind(tdbb, REQUEST(irq_c_exp_index));
return FALSE;
}
@@ -173,6 +173,8 @@
/* Msg308: can't create index %s */
/* Actually create the index */
+
+ SelectivityList selectivity(tdbb->tdbb_default);
current_request = tdbb->tdbb_request;
tdbb->tdbb_request = idx.idx_expression_request;
|