Changeset: 9f3b802134ee for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f3b802134ee Modified Files: clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out.int128 Branch: default Log Message:
Approve after merge. diffs (truncated from 1248 to 300 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 @@ -2827,14 +2827,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. @@ -2933,15 +2929,15 @@ command algebra.mark_grp(b:bat[:any_1,:o address ALGmark_grp_1; comment "grouped mark": Produces a new BAT with per group a locally unique dense ascending sequence of OIDs in the tail. The tail of the first BAT (b) identifies the group that each BUN of b belongs to. The second BAT (g) represents the group extent, i.e., the head is the unique list of group IDs from b's tail. The tail of g gives for each group the base value for the new OID sequence. -command algebra.markT(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid] +command algebra.mark(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid] address ALGtmarkp; comment Produces a BAT with fresh unique dense sequense of OIDs in the tail that starts at base (i.e. [base,..base+b.count()-1] ). The base is uniquely defined by the part_nr (ie we set the highest bits based on the part_nr/nr_parts) -command algebra.markT(b:bat[:any_1,:any_2]):bat[:any_1,:oid] +command algebra.mark(b:bat[:any_1,:any_2]):bat[:any_1,:oid] address ALGtmark_default; comment Produces a BAT with fresh unique OIDs in the tail starting at 0@0. -command algebra.markT(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid] +command algebra.mark(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid] address ALGtmark; comment Produces a BAT with fresh unique dense sequense of OIDs in the tail that starts at base (i.e. [base,..base+b.count()-1] ). @@ -3342,6 +3338,10 @@ command batsql.dec_round(v:bat[:oid,:lng address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -3374,6 +3374,10 @@ command batsql.round(v:bat[:oid,:lng],d: address lng_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] +address wrd_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] address int_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -3470,6 +3474,10 @@ command batcolor.value(c:bat[:oid,:color address CLRbatValueInt; comment Extracts value component from a color atom +command batcolor.ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt]):bat[:oid,:color] +address CLRbatycc; +comment Converts an YCC triplets to a color atom + command batstr.endsWith(s:bat[:oid,:str],suffix:str):bat[:oid,:bit] address STRbatSuffixcst; comment Suffix check. @@ -40145,6 +40153,22 @@ command batcalc.wrd(v:bat[:oid,:flt],dig address batflt_num2dec_wrd; comment cast number to decimal(wrd) and check for overflow +command batcalc.wrd(v:bat[:oid,:str],digits:int,scale:int):bat[:oid,:wrd] +address batstr_2dec_wrd; +comment cast to dec(wrd) and check for overflow + +command batcalc.wrd(v:bat[:oid,:str],digits:int):bat[:oid,:wrd] +address batstr_2num_wrd; +comment cast to wrd and check for overflow + +command batcalc.wrd(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:wrd] +address batnil_2dec_wrd; +comment cast to dec(wrd) and check for overflow + +command batcalc.wrd(v:bat[:oid,:oid],digits:int):bat[:oid,:wrd] +address batnil_2num_wrd; +comment cast to wrd and check for overflow + pattern batcalc.wrd_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:wrd] address CMDconvert_wrd; comment cast from str to wrd with candidates list @@ -40531,6 +40555,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 @@ -40563,10 +40591,6 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bat_bun; comment Delete from the first BAT all BUNs with a corresponding BUN in the second. -command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2] -address BKCdelete_bat; -comment Delete from the first BAT all BUNs with a corresponding head in the second. - command bat.delete(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] address BKCdelete_all; comment Delete all BUNs in a BAT. @@ -40851,7 +40875,11 @@ command bat.shrink(b:bat[:oid,:any_1],de address BKCshrinkBAT; comment Shrink the BAT based on a list of entries identified as to-be-deleted -command bat.setHash(b:bat[:oid,:any_2],prop:bit):bit +command bat.setImprints(b:bat[:oid,:any_2]):bit +address BKCsetImprints; +comment Create n imprints structure on the column + +command bat.setHash(b:bat[:oid,:any_2]):bit address BKCsetHash; comment Create a hash structure on the column @@ -48566,6 +48594,10 @@ command calc.second_interval(sc:int,v:ln address lng_dec2second_interval; comment cast lng decimal to a second_interval +command calc.second_interval(sc:int,v:wrd,ek:int,sk:int):lng +address wrd_dec2second_interval; +comment cast wrd decimal to a second_interval + command calc.second_interval(sc:int,v:int,ek:int,sk:int):lng address int_dec2second_interval; comment cast int decimal to a second_interval @@ -49151,6 +49183,22 @@ command calc.wrd(v:flt,digits:int,scale: address flt_num2dec_wrd; comment cast number to decimal(wrd) and check for overflow +command calc.wrd(v:str,digits:int,scale:int):wrd +address str_2dec_wrd; +comment cast to dec(wrd) and check for overflow + +command calc.wrd(v:str,digits:int):wrd +address str_2num_wrd; +comment cast to wrd and check for overflow + +command calc.wrd(v:void,digits:int,scale:int):wrd +address nil_2dec_wrd; +comment cast to dec(wrd) and check for overflow + +command calc.wrd(v:void,digits:int):wrd +address nil_2num_wrd; +comment cast to wrd and check for overflow + command calc.wkb(v:wkb):wkb address wkbFromWKB; command calc.wkb{unsafe}(v:str):wkb @@ -51001,31 +51049,45 @@ comment post: [:xor=]([:rotate=](h, nbit command mkey.hash(v:hge):wrd address MKEYhash_hge; -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; @@ -51142,7 +51204,7 @@ comment The pow(x,y) function returns t command mmath.pow(x:flt,y:flt):flt address MATHbinary_POWflt; command mmath.rand{unsafe}(v:int):int -address MATHrandintseed; +address MATHrandintarg; comment return a random number command mmath.rand{unsafe}():int @@ -51495,10 +51557,18 @@ comment Subtract seconds from a time command mtime.timestamp(t:timestamp):timestamp address MTIMEtimestamp2timestamp; +command mtime.timestamp_add_month_interval(t:timestamp,s:lng):timestamp +address MTIMEtimestamp_add_month_interval_lng_wrap; +comment Add months to a timestamp + command mtime.timestamp_add_month_interval(t:timestamp,s:int):timestamp address MTIMEtimestamp_add_month_interval_wrap; comment Add months to a timestamp +command mtime.timestamp_sub_month_interval(t:timestamp,s:lng):timestamp +address MTIMEtimestamp_sub_month_interval_lng_wrap; +comment Subtract months from a timestamp + command mtime.timestamp_sub_month_interval(t:timestamp,s:int):timestamp address MTIMEtimestamp_sub_month_interval_wrap; comment Subtract months from a timestamp @@ -52455,6 +52525,10 @@ command sql.dec_round(v:lng,r:lng):lng address lng_dec_round_wrap; comment round off the value v to nearests multiple of r +command sql.dec_round(v:wrd,r:wrd):wrd +address wrd_dec_round_wrap; +comment round off the value v to nearests multiple of r + command sql.dec_round(v:int,r:int):int address int_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -52671,6 +52745,10 @@ command sql.round(v:lng,d:int,s:int,r:bt address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command sql.round(v:wrd,d:int,s:int,r:bte):wrd +address wrd_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) 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 @@ -2747,6 +2747,10 @@ command batsql.dec_round(v:bat[:oid,:wrd address wrd_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:wrd],r:wrd):bat[:oid,:wrd] +address wrd_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:int],r:int):bat[:oid,:int] address int_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2779,6 +2783,10 @@ command batsql.round(v:bat[:oid,:wrd],d: address wrd_bat_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:wrd],d:int,s:int,r:bte):bat[:oid,:wrd] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list