Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14704/src/backends/monet5
Modified Files:
Tag: SQL_2-24
sql.mx
Log Message:
used wrong hash function (gave problems on optimized multi column selects)
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.263.2.3
retrieving revision 1.263.2.4
diff -u -d -r1.263.2.3 -r1.263.2.4
--- sql.mx 5 Jun 2008 05:36:11 -0000 1.263.2.3
+++ sql.mx 22 Jun 2008 13:45:35 -0000 1.263.2.4
@@ -316,15 +316,7 @@
pattern calc.rotate_xor_hash(h:int, nbits:int, v:any_1) :int address
MKEYrotate_xor_hash;
command batcalc.rotate_xor_hash(h:bat[:oid,:int], nbits:int,
b:bat[:oid,:any_1]) :bat[:oid,:int] address MKEYbulk_rotate_xor_hash;
-pattern calc.hash( v:any ) :int address MKEYhash;
-command calc.hash( v:chr ) :int address MKEYhash_chr;
-command calc.hash( v:bte ) :int address MKEYhash_bte;
-command calc.hash( v:sht ) :int address MKEYhash_sht;
-command calc.hash( v:int ) :int address MKEYhash_int;
-command calc.hash( v:flt ) :int address MKEYhash_flt;
-command calc.hash( v:dbl ) :int address MKEYhash_dbl;
-command calc.hash( v:lng ) :int address MKEYhash_lng;
-command calc.hash( v:str ) :int address MKEYhash_str;
+pattern calc.hash( v:any ) :int address hash_wrap;
command batcalc.hash( b:bat[:oid,:any_1] ) :bat[:oid,:int]
address bathash_wrap
@@ -1937,7 +1929,7 @@
if (ATOMvarsized(b->ttype)) { /* ugh */
BUN p,q;
- BATloop(b,p,q){
+ BATloop(b,p,q) {
ptr v = BUNtail(bi,p);
*r++ = (hash(v)) & 0xEFFFFFFF;
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
