Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv655/src/server
Modified Files:
rel_bin.mx sql_rel2bin.mx sql_updates.mx
Log Message:
hash/xor now return wrd instead of int
U sql_rel2bin.mx
Index: sql_rel2bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_rel2bin.mx,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- sql_rel2bin.mx 19 Jun 2008 14:08:31 -0000 1.122
+++ sql_rel2bin.mx 18 Sep 2008 12:13:17 -0000 1.123
@@ -638,7 +638,7 @@
{
sql_subtype *it;
stmt *h = NULL;
- stmt *bits = stmt_atom_int(1 + 31/(list_length(l)+2));
+ stmt *bits = stmt_atom_int(1 + ((sizeof(wrd)*8)-1)/(list_length(l)));
node *icn;
it = sql_bind_localtype("int");
@@ -674,7 +674,7 @@
node *m;
sql_subtype *it;
stmt *h = NULL;
- stmt *bits = stmt_atom_int(1 + 31/(list_length(l)+2));
+ stmt *bits = stmt_atom_int(1 + ((sizeof(wrd)*8)-1)/(list_length(l)));
stmt *o = NULL;
it = sql_bind_localtype("int");
U rel_bin.mx
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- rel_bin.mx 22 Aug 2008 09:52:18 -0000 1.51
+++ rel_bin.mx 18 Sep 2008 12:13:16 -0000 1.52
@@ -1155,7 +1155,7 @@
{
sql_subtype *it = sql_bind_localtype("int");
stmt *h = NULL;
- stmt *bits = stmt_atom_int(1 + 31/(list_length(i->columns)+2));
+ stmt *bits = stmt_atom_int(1 +
((sizeof(wrd)*8)-1)/(list_length(i->columns)));
sql_exp *e = en->data;
sql_exp *l = e->l;
stmt *idx = bin_find_column(sub, l->l, i->base.name);
U sql_updates.mx
Index: sql_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_updates.mx,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- sql_updates.mx 16 Sep 2008 17:03:42 -0000 1.147
+++ sql_updates.mx 18 Sep 2008 12:13:19 -0000 1.148
@@ -257,7 +257,7 @@
{
node *m;
sql_subtype *it;
- int bits = 1 + 31/(list_length(i->columns)+2);
+ int bits = 1 + ((sizeof(wrd)*8)-1)/(list_length(i->columns));
stmt *h = NULL;
if (list_length(i->columns) <= 1)
@@ -927,7 +927,7 @@
/* calculate new value */
node *m;
sql_subtype *it;
- int bits = 1 + 31/(list_length(i->columns)+2);
+ int bits = 1 + ((sizeof(wrd)*8)-1)/(list_length(i->columns));
stmt *h = NULL, *ts;
if (list_length(i->columns) <= 1)
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
