Changeset: 072d2dc71cf4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=072d2dc71cf4 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/backends/monet5/sql_gencode.c sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/test/leaks/Tests/check0_bam.stable.out sql/test/leaks/Tests/temp2_bam.stable.out sql/test/leaks/Tests/temp3_bam.stable.out Branch: default Log Message:
merger diffs (truncated from 3628 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 @@ -2310,14 +2310,10 @@ pattern algebra.firstn(b:bat[:oid,:any], address ALGfirstn; comment Calculate first N values of B -command algebra.fetch(b:bat[:any_2,:any_1],x:int):any_1 -address ALGfetchint; -comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count - -command algebra.fetch(b:bat[:any_2,:any_1],x:lng):any_1 -address ALGfetch; command algebra.fetch(b:bat[:any_2,:any_1],x:oid):any_1 address ALGfetchoid; +comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count + command algebra.find(b:bat[:any_1,:any_2],h:any_1):any_2 address ALGfind; comment Returns the tail value 't' for which some [h,t] BUN exists in b. If no such BUN exists, an error occurs. @@ -31485,6 +31481,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 @@ -40027,31 +40027,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 @@ -2311,14 +2311,10 @@ pattern algebra.firstn(b:bat[:oid,:any], address ALGfirstn; comment Calculate first N values of B -command algebra.fetch(b:bat[:any_2,:any_1],x:int):any_1 -address ALGfetchint; -comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count - -command algebra.fetch(b:bat[:any_2,:any_1],x:lng):any_1 -address ALGfetch; command algebra.fetch(b:bat[:any_2,:any_1],x:oid):any_1 address ALGfetchoid; +comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count + command algebra.find(b:bat[:any_1,:any_2],h:any_1):any_2 address ALGfind; comment Returns the tail value 't' for which some [h,t] BUN exists in b. If no such BUN exists, an error occurs. @@ -31406,6 +31402,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 @@ -39944,31 +39944,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 @@ -2311,14 +2311,10 @@ pattern algebra.firstn(b:bat[:oid,:any], address ALGfirstn; comment Calculate first N values of B -command algebra.fetch(b:bat[:any_2,:any_1],x:int):any_1 -address ALGfetchint; -comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count - -command algebra.fetch(b:bat[:any_2,:any_1],x:lng):any_1 -address ALGfetch; command algebra.fetch(b:bat[:any_2,:any_1],x:oid):any_1 address ALGfetchoid; +comment Returns the tail value of the BUN at x-th position with 0 <= x < b.count + command algebra.find(b:bat[:any_1,:any_2],h:any_1):any_2 address ALGfind; comment Returns the tail value 't' for which some [h,t] BUN exists in b. If no such BUN exists, an error occurs. @@ -31406,6 +31402,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 @@ -39920,31 +39920,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 @@ -2310,14 +2310,10 @@ pattern algebra.firstn(b:bat[:oid,:any], address ALGfirstn; comment Calculate first N values of B _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
