Changeset: 5e9276d25e3d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e9276d25e3d Modified Files: clients/Tests/MAL-signatures_all.stable.out 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 clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_calc.c gdk/gdk_calc.h geom/monetdb5/geom.c geom/monetdb5/geom.mal monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.mal monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/mtime.mal monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/00_calc_hge.mal monetdb5/modules/mal/00_calc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/01_calc.mal.sh monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/batmtime.mal monetdb5/modules/mal/batmtime.mal.sh Branch: default Log Message:
Cleanup: use "any" parameter for (bat)calc.isnil, remove others. Also, we now have batcalc.isnotnil. diffs (truncated from 3027 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 @@ -24806,83 +24806,19 @@ pattern batcalc.int(b:bat[:oid,:bit]):ba address CMDconvertsignal_int; comment cast from bit to int, signal error on overflow -pattern batcalc.isnil(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.isnotnil(b:bat[:oid,:any],s:bat[:oid,:oid]):bat[:oid,:bit] +address CMDbatISNOTNIL; +comment Unary check for notnil over the tail of the bat with candidates list + +pattern batcalc.isnotnil(b:bat[:oid,:any]):bat[:oid,:bit] +address CMDbatISNOTNIL; +comment Unary check for notnil over the tail of the bat + +pattern batcalc.isnil(b:bat[:oid,:any],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDbatISNIL; comment Unary check for nil over the tail of the bat with candidates list -pattern batcalc.isnil(b:bat[:oid,:str]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:dbl],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:dbl]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:flt],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:flt]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:lng],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:lng]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:wrd],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:wrd]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:int],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:int]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:sht],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:sht]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:bte],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:bte]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:bit],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:bit]):bat[:oid,:bit] +pattern batcalc.isnil(b:bat[:oid,:any]):bat[:oid,:bit] address CMDbatISNIL; comment Unary check for nil over the tail of the bat @@ -24942,30 +24878,6 @@ pattern batcalc.iszero(b:bat[:oid,:bte]) address CMDbatISZERO; comment Unary check for zero over the tail of the bat -pattern batcalc.isnil(b:bat[:oid,:timestamp],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:timestamp]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:daytime],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:daytime]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - -pattern batcalc.isnil(b:bat[:oid,:date],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat with candidates list - -pattern batcalc.isnil(b:bat[:oid,:date]):bat[:oid,:bit] -address CMDbatISNIL; -comment Unary check for nil over the tail of the bat - command batcalc.lng(s1:int,v:bat[:oid,:lng],d2:int,s2:int):bat[:oid,:lng] address batlng_dec2dec_lng; comment cast decimal(lng) to decimal(lng) and check for overflow @@ -35987,10 +35899,6 @@ command calc.identity(X_1:any_2):oid address SQLidentity; comment Returns a unique row identitfier. -command calc.isnil(v:wkb):bit -address wkbIsnil; -comment Nil test for wkb value - pattern calc.ifthenelse(b:bit,t:any_1,f:any_1):any_1 address CALCswitchbit; comment If VALUE is true return MIDDLE else RIGHT @@ -36039,99 +35947,11 @@ pattern calc.int(v:void):int address CMDvarCONVERT; comment Cast VALUE to int -pattern calc.isnotnil(v:BAT):bit +pattern calc.isnotnil(v:any):bit address CMDvarISNOTNIL; comment Unary check for notnil of V -pattern calc.isnotnil(v:str):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:oid):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:dbl):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:flt):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:lng):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:wrd):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:int):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:sht):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:bte):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:bit):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnotnil(v:void):bit -address CMDvarISNOTNIL; -comment Unary check for notnil of V - -pattern calc.isnil(v:BAT):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:str):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:oid):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:dbl):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:flt):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:lng):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:wrd):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:int):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:sht):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:bte):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:bit):bit -address CMDvarISNIL; -comment Unary check for nil of V - -pattern calc.isnil(v:void):bit +pattern calc.isnil(v:any):bit address CMDvarISNIL; comment Unary check for nil of V @@ -36163,10 +35983,6 @@ pattern calc.iszero(v:bte):bit address CMDvarISZERO; comment Unary check for zero of V -command calc.isnil(v:inet):bit -address INET_isnil; -comment Nil test for inet value - command calc.inet(s:str):inet address INET_fromstr; comment Convert a string to an inet @@ -36175,30 +35991,6 @@ command calc.inet(s:inet):inet address INET_inet; comment Convert a inet to an inet -pattern calc.isnil(v:timestamp):bit -address CMDvarISNIL; -comment Nil test for timestamp value - -pattern calc.isnil(v:daytime):bit -address CMDvarISNIL; -comment Nil test for daytime value - -pattern calc.isnil(v:date):bit -address CMDvarISNIL; -comment Nil test for date value - -pattern calc.isnil(v:json):bit -address CMDvarISNIL; -comment Nil test for json value - -command calc.isnil(v:sqlblob):bit -address BLOB_isnil; -comment Nil test for blob value - -command calc.isnil(v:blob):bit -address BLOB_isnil; -comment Nil test for blob value - command calc.json(j:json):json address JSONstr2json; comment Convert JSON to JSON. Dealing with escape characters 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 @@ -32035,83 +32035,19 @@ pattern batcalc.int(b:bat[:oid,:bit]):ba address CMDconvertsignal_int; comment cast from bit to int, signal error on overflow -pattern batcalc.isnil(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.isnotnil(b:bat[:oid,:any],s:bat[:oid,:oid]):bat[:oid,:bit] +address CMDbatISNOTNIL; +comment Unary check for notnil over the tail of the bat with candidates list + +pattern batcalc.isnotnil(b:bat[:oid,:any]):bat[:oid,:bit] +address CMDbatISNOTNIL; +comment Unary check for notnil over the tail of the bat + +pattern batcalc.isnil(b:bat[:oid,:any],s:bat[:oid,:oid]):bat[:oid,:bit] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
