Changeset: 56c438d0b5e4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56c438d0b5e4 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out monetdb5/modules/mal/mkey.c monetdb5/modules/mal/mkey.h monetdb5/modules/mal/mkey.mal sql/benchmarks/tpch/Tests/20-explain.stable.out Branch: Oct2014 Log Message:
Fixed mkey module to use the same hash function whichever way it is called. This should fix bug 3474 properly (except for upgrade issues). diffs (truncated from 1724 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -31569,6 +31569,10 @@ command batmtime.seconds(d:bat[:oid,:day address MTIMEdaytime_extract_seconds_bulk; command batmtime.year(d:bat[:oid,:date]):bat[:oid,:int] address MTIMEdate_extract_year_bulk; +command batmkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] +address MKEYbathash; +comment calculate a hash value + command bat.append(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] address BKCappend_val_force_wrap; comment append the value u to i @@ -40111,31 +40115,45 @@ pattern mkey.bulk_rotate_xor_hash(h:wrd, address MKEYrotate_xor_hash; comment post: [:xor=]([:rotate=](h, nbits), [hash](b)) -command mkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] -address MKEYbathash; +pattern mkey.hash(v:str):wrd +address MKEYhash; comment calculate a hash value -command mkey.hash(v:str):wrd -address MKEYhash_str; -command mkey.hash(v:lng):wrd -address MKEYhash_lng; -command mkey.hash(v:dbl):wrd -address MKEYhash_dbl; -command mkey.hash(v:wrd):wrd -address MKEYhash_wrd; -command mkey.hash(v:flt):wrd -address MKEYhash_flt; -command mkey.hash(v:int):wrd -address MKEYhash_int; -command mkey.hash(v:sht):wrd -address MKEYhash_sht; -command mkey.hash(v:bte):wrd -address MKEYhash_bte; -command mkey.hash(v:bit):wrd -address MKEYhash_bte; +pattern mkey.hash(v:lng):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:dbl):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:wrd):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:flt):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:int):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:sht):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bte):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bit):wrd +address MKEYhash; +comment calculate a hash value + pattern mkey.hash(v:any):wrd address MKEYhash; -comment compute a hash int number from any value +comment calculate a hash value command mkey.rotate(v:wrd,nbits:int):wrd address MKEYrotate; diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -31490,6 +31490,10 @@ command batmtime.seconds(d:bat[:oid,:day address MTIMEdaytime_extract_seconds_bulk; command batmtime.year(d:bat[:oid,:date]):bat[:oid,:int] address MTIMEdate_extract_year_bulk; +command batmkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] +address MKEYbathash; +comment calculate a hash value + command bat.append(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] address BKCappend_val_force_wrap; comment append the value u to i @@ -40028,31 +40032,45 @@ pattern mkey.bulk_rotate_xor_hash(h:wrd, address MKEYrotate_xor_hash; comment post: [:xor=]([:rotate=](h, nbits), [hash](b)) -command mkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] -address MKEYbathash; +pattern mkey.hash(v:str):wrd +address MKEYhash; comment calculate a hash value -command mkey.hash(v:str):wrd -address MKEYhash_str; -command mkey.hash(v:lng):wrd -address MKEYhash_lng; -command mkey.hash(v:dbl):wrd -address MKEYhash_dbl; -command mkey.hash(v:wrd):wrd -address MKEYhash_wrd; -command mkey.hash(v:flt):wrd -address MKEYhash_flt; -command mkey.hash(v:int):wrd -address MKEYhash_int; -command mkey.hash(v:sht):wrd -address MKEYhash_sht; -command mkey.hash(v:bte):wrd -address MKEYhash_bte; -command mkey.hash(v:bit):wrd -address MKEYhash_bte; +pattern mkey.hash(v:lng):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:dbl):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:wrd):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:flt):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:int):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:sht):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bte):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bit):wrd +address MKEYhash; +comment calculate a hash value + pattern mkey.hash(v:any):wrd address MKEYhash; -comment compute a hash int number from any value +comment calculate a hash value command mkey.rotate(v:wrd,nbits:int):wrd address MKEYrotate; diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -31490,6 +31490,10 @@ command batmtime.seconds(d:bat[:oid,:day address MTIMEdaytime_extract_seconds_bulk; command batmtime.year(d:bat[:oid,:date]):bat[:oid,:int] address MTIMEdate_extract_year_bulk; +command batmkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] +address MKEYbathash; +comment calculate a hash value + command bat.append(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] address BKCappend_val_force_wrap; comment append the value u to i @@ -40004,31 +40008,45 @@ pattern mkey.bulk_rotate_xor_hash(h:wrd, address MKEYrotate_xor_hash; comment post: [:xor=]([:rotate=](h, nbits), [hash](b)) -command mkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] -address MKEYbathash; +pattern mkey.hash(v:str):wrd +address MKEYhash; comment calculate a hash value -command mkey.hash(v:str):wrd -address MKEYhash_str; -command mkey.hash(v:lng):wrd -address MKEYhash_lng; -command mkey.hash(v:dbl):wrd -address MKEYhash_dbl; -command mkey.hash(v:wrd):wrd -address MKEYhash_wrd; -command mkey.hash(v:flt):wrd -address MKEYhash_flt; -command mkey.hash(v:int):wrd -address MKEYhash_int; -command mkey.hash(v:sht):wrd -address MKEYhash_sht; -command mkey.hash(v:bte):wrd -address MKEYhash_bte; -command mkey.hash(v:bit):wrd -address MKEYhash_bte; +pattern mkey.hash(v:lng):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:dbl):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:wrd):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:flt):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:int):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:sht):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bte):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:bit):wrd +address MKEYhash; +comment calculate a hash value + pattern mkey.hash(v:any):wrd address MKEYhash; -comment compute a hash int number from any value +comment calculate a hash value command mkey.rotate(v:wrd,nbits:int):wrd address MKEYrotate; diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -31485,6 +31485,10 @@ command batmtime.seconds(d:bat[:oid,:day address MTIMEdaytime_extract_seconds_bulk; command batmtime.year(d:bat[:oid,:date]):bat[:oid,:int] address MTIMEdate_extract_year_bulk; +command batmkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] +address MKEYbathash; +comment calculate a hash value + command bat.append(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] address BKCappend_val_force_wrap; comment append the value u to i @@ -39817,31 +39821,45 @@ pattern mkey.bulk_rotate_xor_hash(h:wrd, address MKEYrotate_xor_hash; comment post: [:xor=]([:rotate=](h, nbits), [hash](b)) -command mkey.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] -address MKEYbathash; +pattern mkey.hash(v:str):wrd +address MKEYhash; comment calculate a hash value -command mkey.hash(v:str):wrd -address MKEYhash_str; -command mkey.hash(v:lng):wrd -address MKEYhash_lng; -command mkey.hash(v:dbl):wrd -address MKEYhash_dbl; -command mkey.hash(v:wrd):wrd -address MKEYhash_wrd; -command mkey.hash(v:flt):wrd -address MKEYhash_flt; -command mkey.hash(v:int):wrd -address MKEYhash_int; -command mkey.hash(v:sht):wrd -address MKEYhash_sht; -command mkey.hash(v:bte):wrd -address MKEYhash_bte; -command mkey.hash(v:bit):wrd -address MKEYhash_bte; +pattern mkey.hash(v:lng):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:dbl):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:wrd):wrd +address MKEYhash; +comment calculate a hash value + +pattern mkey.hash(v:flt):wrd +address MKEYhash; +comment calculate a hash value _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
