Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19756/src/storage
Modified Files:
store.mx
Log Message:
the relational version now does use the hash indices on selects
U store.mx
Index: store.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store.mx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- store.mx 31 Jan 2008 16:53:35 -0000 1.10
+++ store.mx 14 May 2008 20:18:28 -0000 1.11
@@ -365,11 +365,11 @@
kc->trunc = *(int *)v; _DELETE(v);
list_append(i->columns, kc);
assert(kc->c);
- if (i->type == unique)
+ if (i->type == hash_idx)
kc->c->unique = 1;
/* create storage */
- if (i->type == unique && list_length(i->columns) == 2 && isTable(i->t))
+ if (i->type == hash_idx && list_length(i->columns) == 2 &&
isTable(i->t))
store_funcs.create_idx(tr, i);
}
@@ -3530,7 +3530,7 @@
nk->type = kt;
nk->columns = list_create((fdestroy) &kc_destroy);
nk->t = t;
- nk->idx = sql_trans_create_idx(tr, t, name, (nk->type == fkey) ?
join_idx : unique);
+ nk->idx = sql_trans_create_idx(tr, t, name, (nk->type == fkey) ?
join_idx : hash_idx);
nk->idx->key = nk;
uk = (sql_ukey *) nk;
@@ -3574,7 +3574,7 @@
nk->type = kt;
nk->columns = list_create((fdestroy) &kc_destroy);
nk->t = t;
- nk->idx = sql_trans_create_idx(tr, t, name, (nk->type == fkey) ?
join_idx : unique);
+ nk->idx = sql_trans_create_idx(tr, t, name, (nk->type == fkey) ?
join_idx : hash_idx);
nk->idx->key = nk;
fk = (sql_fkey *) nk;
@@ -3737,7 +3737,7 @@
ic->trunc = 0;
list_append(i->columns, ic);
- if (i->type == unique && list_length(i->columns) > 1) {
+ if (i->type == hash_idx && list_length(i->columns) > 1) {
/* Correct the unique flag of the keys first column */
c->unique = list_length(i->columns);
if (c->unique == 2) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
