Changeset: aa79cc44210d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa79cc44210d Modified Files: clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out.int128 monetdb5/modules/mal/00_calc_hge.mal monetdb5/modules/mal/00_mkey_hge.mal Branch: default Log Message:
Approvals and fixes that got lost during merge. diffs (109 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -40603,7 +40603,7 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bun; comment Delete one specific BUN. -command bat.densebat(size:wrd):bat[:void,:void] +command bat.densebat(size:wrd):bat[:oid,:oid] address BKCdensebat; comment Creates a new [void,void] BAT of size 'size'. @@ -42476,7 +42476,7 @@ address CMDvarADDsignal; comment Return V1 + V2, guarantee no overflow by returning larger type pattern calc.++(v:hge):hge -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.-(v1:dbl,v2:dbl):dbl @@ -42944,7 +42944,7 @@ address CMDvarSUBsignal; comment Return V1 - V2, guarantee no overflow by returning larger type pattern calc.--(v:hge):hge -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.-(v:hge):hge @@ -51047,8 +51047,10 @@ pattern mkey.bulk_rotate_xor_hash(h:wrd, address MKEYrotate_xor_hash; comment post: [:xor=]([:rotate=](h, nbits), [hash](b)) -command mkey.hash(v:hge):wrd -address MKEYhash_hge; +pattern mkey.hash(v:hge):wrd +address MKEYhash; +comment calculate a hash value + pattern mkey.hash(v:str):wrd address MKEYhash; comment calculate a hash value diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -40527,7 +40527,7 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bun; comment Delete one specific BUN. -command bat.densebat(size:wrd):bat[:void,:void] +command bat.densebat(size:wrd):bat[:oid,:oid] address BKCdensebat; comment Creates a new [void,void] BAT of size 'size'. diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -40527,7 +40527,7 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bun; comment Delete one specific BUN. -command bat.densebat(size:wrd):bat[:void,:void] +command bat.densebat(size:wrd):bat[:oid,:oid] address BKCdensebat; comment Creates a new [void,void] BAT of size 'size'. diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -40550,7 +40550,7 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bun; comment Delete one specific BUN. -command bat.densebat(size:wrd):bat[:void,:void] +command bat.densebat(size:wrd):bat[:oid,:oid] address BKCdensebat; comment Creates a new [void,void] BAT of size 'size'. diff --git a/monetdb5/modules/mal/00_calc_hge.mal b/monetdb5/modules/mal/00_calc_hge.mal --- a/monetdb5/modules/mal/00_calc_hge.mal +++ b/monetdb5/modules/mal/00_calc_hge.mal @@ -55,12 +55,12 @@ comment "Unary negation of V"; pattern ++(v:hge) :hge -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern --(v:hge) :hge -address CMDvarDECR +address CMDvarDECRsignal comment "Unary V - 1"; diff --git a/monetdb5/modules/mal/00_mkey_hge.mal b/monetdb5/modules/mal/00_mkey_hge.mal --- a/monetdb5/modules/mal/00_mkey_hge.mal +++ b/monetdb5/modules/mal/00_mkey_hge.mal @@ -17,5 +17,6 @@ module mkey; -command hash(v:hge):wrd -address MKEYhash_hge; +pattern hash(v:hge):wrd +address MKEYhash +comment "calculate a hash value"; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
