Changeset: f25308eea849 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f25308eea849 Modified Files: clients/Tests/MAL-signatures_all.stable.err 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/SQL-dump_all.stable.err clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_none.stable.out clients/Tests/SQL-dump_none.stable.out.int128 clients/Tests/exports.stable.out Branch: default Log Message:
Approve clients tests. diffs (truncated from 13084 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.err b/clients/Tests/MAL-signatures_all.stable.err --- a/clients/Tests/MAL-signatures_all.stable.err +++ b/clients/Tests/MAL-signatures_all.stable.err @@ -29,6 +29,7 @@ stderr of test 'MAL-signatures_all` in d # 21:33:48 > + # 21:33:51 > # 21:33:51 > "Done." # 21:33:51 > 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 @@ -2322,14 +2322,13 @@ command algebra.groupby(gids:bat[:oid,:o address ALGgroupby; comment Produces a new BAT with groups identified by the head column. The result contains tail times the head value, ie the tail contains the result group sizes. -command algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],esc:str) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +function algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]); +command algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) address ILIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case insensitive match.The result is two aligned bats with oids of matching rows. -command algebra.ilikesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCREilike_join_pcre; +function algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]; function algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]; -function algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid]; command algebra.ilike(s:str,pat:str):bit address PCREilike2; command algebra.ilike(s:str,pat:str,esc:str):bit @@ -2378,25 +2377,17 @@ pattern algebra.leftjoinPath(l:bat[:any, address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. -command algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],esc:str) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +function algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]); +command algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) address LIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case sensitive match.The result is two aligned bats with oids of matching rows. -command algebra.likesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCRElike_join_pcre; +function algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]; function algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]; -command algebra.likesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid] -address PCRElikesubselect3; -comment Select all head values of the first input BAT for which the tail value is "like" the given (SQL-style) pattern and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. - command algebra.likesubselect(b:bat[:oid,:str],s:bat[:oid,:oid],pat:str,esc:str,caseignore:bit,anti:bit):bat[:oid,:oid] address PCRElikesubselect2; comment Select all head values of the first input BAT for which the tail value is "like" the given (SQL-style) pattern and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. -command algebra.likesubselect(b:bat[:oid,:str],pat:str,esc:str,caseignore:bit,anti:bit):bat[:oid,:oid] -address PCRElikesubselect1; -comment Select all head values for which the tail value is "like" the given (SQL-style) pattern. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. - command algebra.like(s:str,pat:str):bit address PCRElike2; command algebra.like(s:str,pat:str,esc:str):bit @@ -2883,7 +2874,7 @@ address BATPCRElike2; command batalgebra.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] address BATPCRElike; command batalgebra.not_ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] -address BATPCREnotliike2; +address BATPCREnotilike2; command batalgebra.not_ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] address BATPCREnotilike; command batalgebra.not_like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] @@ -2966,14 +2957,6 @@ command batstr.endsWith(s:bat[:oid,:str] address STRbatSuffix; comment Suffix check. -command batstr.ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] -address BATPCREilike2; -command batstr.ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] -address BATPCREilike; -command batstr.like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] -address BATPCRElike2; -command batstr.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] -address BATPCRElike; command batstr.lpad(s:bat[:oid,:str],n:bat[:oid,:int],s2:bat[:oid,:str]):bat[:oid,:str] address STRbatLpad2_bat_bat; comment Prepend the second strings to the first strings to reach the given lengths. Truncate the first strings on the right if their lengths is larger than the given lengths. @@ -3014,14 +2997,6 @@ command batstr.length(s:bat[:oid,:str]): address STRbatLength; comment Return the length of a string. -command batstr.not_ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] -address BATPCREnotilike2; -command batstr.not_ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] -address BATPCREnotilike; -command batstr.not_like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] -address BATPCREnotlike2; -command batstr.not_like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] -address BATPCREnotlike; command batstr.nbytes(s:bat[:oid,:str]):bat[:oid,:int] address STRbatBytes; comment Return the string length in bytes. @@ -39591,13 +39566,21 @@ command lsst.ptinsphbox(ra:dbl,dec:dbl,r address qserv_ptInSphBox; comment Returns 1 if the given spherical longitude/latitude box contains the given position -command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int) (lr:bat[:oid,:oid],rr:bat[:oid,:oid]) +command lsst.xmatchsubjoin(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (lr:bat[:oid,:oid],rr:bat[:oid,:oid]) +address LSSTxmatchsubjoin; +comment Return the HtmID pairs that lie within the same triangle at level depth + +command lsst.xmatchsubselect(l:bat[:oid,:lng],cand:bat[:oid,:oid],r:lng,depth:int,anti:bit):bat[:oid,:oid] +address LSSTxmatchsubselect; +comment Return the HtmID's that lie within the same triangle as r at level depth + +command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit address LSSTxmatch; comment Return the HtmID pairs that lie within the same triangle at level depth -command mapreduce.getCloud(nme:str):bat[:oid,:str] -address MRgetCloud; -comment Localize the elements of a named cloud +command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit +address LSSTxmatch; +comment Return true when the HtmID pairs that lie within the same triangle at level depth pattern mapi.bind(key:int,remoteName:str):bat[:oid,:any_2] address SERVERbindBAT; @@ -39801,6 +39784,10 @@ command mapi.trace(mid:int,flag:int):voi address SERVERtrace; comment Toggle the Mapi library debug tracer. +command mapreduce.getCloud(nme:str):bat[:oid,:str] +address MRgetCloud; +comment Localize the elements of a named cloud + pattern manual.completion(pat:str):void address MANUALcompletion; comment Produces the wordcompletion table. @@ -41966,10 +41953,6 @@ command str.endsWith(s:str,suffix:str):b address STRSuffix; comment Suffix check. -command str.ilike(s:str,pat:str):bit -address PCREilike2; -command str.ilike(s:str,pat:str,esc:str):bit -address PCREilike3; command str.insert(s:str,start:int,l:int,s2:str):str address STRinsert; comment Insert a string into another @@ -41978,10 +41961,6 @@ command str.iconv(org:str,fromCs:str,toC address STRIconv; comment String codeset conversion -command str.like(s:str,pat:str):bit -address PCRElike2; -command str.like(s:str,pat:str,esc:str):bit -address PCRElike3; command str.locate(s1:str,s2:str,start:int):int address STRlocate2; comment Locate the start position of a string @@ -42018,14 +41997,6 @@ command str.length(s:str):int address STRLength; comment Return the length of a string. -command str.not_ilike(s:str,pat:str):bit -address PCREnotilike2; -command str.not_ilike(s:str,pat:str,esc:str):bit -address PCREnotilike3; -command str.not_like(s:str,pat:str):bit -address PCREnotlike2; -command str.not_like(s:str,pat:str,esc:str):bit -address PCREnotlike3; command str.nbytes(s:str):int address STRBytes; comment Return the string length in bytes. 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 @@ -13,17 +13,12 @@ stdout of test 'MAL-signatures_all` in d # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://gaai.mullender.nl:33053/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13793/.s.monetdb.33053 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded -# MonetDB/R module loaded Ready. -# 21:44:51 > -# 21:44:51 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13793" "--port=33053" -# 21:44:51 > +# 15:16:50 > +# 15:16:50 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9622" "--port=32080" +# 15:16:50 > #?*) command aggr.avg(b:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_1]) (X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) @@ -228,7 +223,6 @@ comment Return the current size (in numb command aggr.exist(b:bat[:oid,:any_2],h:any_1):bit address ALGexist; - command aggr.jsonaggr(val:bat[:oid,:dbl]):str address JSONgroupStr; comment Aggregate the double values to array. @@ -50563,10 +50557,6 @@ command lsst.xmatch(l:lng,r:lng,depth:in address LSSTxmatch; comment Return true when the HtmID pairs that lie within the same triangle at level depth -command mapreduce.getCloud(nme:str):bat[:oid,:str] -address MRgetCloud; -comment Localize the elements of a named cloud - pattern mapi.bind(key:int,remoteName:str):bat[:oid,:any_2] address SERVERbindBAT; comment Bind a remote variable to a local one. @@ -50773,6 +50763,10 @@ command mapi.trace(mid:int,flag:int):voi address SERVERtrace; comment Toggle the Mapi library debug tracer. +command mapreduce.getCloud(nme:str):bat[:oid,:str] +address MRgetCloud; +comment Localize the elements of a named cloud + pattern manual.completion(pat:str):void address MANUALcompletion; comment Produces the wordcompletion table. @@ -53743,7 +53737,7 @@ address rule_fromstr; command zrule.#tostr():str address rule_tostr; -# 21:44:58 > -# 21:44:58 > "Done." -# 21:44:58 > - +# 15:15:16 > +# 15:15:16 > "Done." +# 15:15:16 > + 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 @@ -2323,14 +2323,13 @@ command algebra.groupby(gids:bat[:oid,:o address ALGgroupby; comment Produces a new BAT with groups identified by the head column. The result contains tail times the head value, ie the tail contains the result group sizes. -command algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],esc:str) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +function algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]); +command algebra.ilikesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) address ILIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case insensitive match.The result is two aligned bats with oids of matching rows. -command algebra.ilikesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCREilike_join_pcre; +function algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]; function algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]; -function algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid]; command algebra.ilike(s:str,pat:str):bit address PCREilike2; command algebra.ilike(s:str,pat:str,esc:str):bit @@ -2379,25 +2378,17 @@ pattern algebra.leftjoinPath(l:bat[:any, address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. -command algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],esc:str) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +function algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]); +command algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) address LIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case sensitive match.The result is two aligned bats with oids of matching rows. -command algebra.likesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCRElike_join_pcre; +function algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,anti:bit):bat[:oid,:oid]; function algebra.likesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid]; -command algebra.likesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid] -address PCRElikesubselect3; -comment Select all head values of the first input BAT for which the tail value is "like" the given (SQL-style) pattern and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. - command algebra.likesubselect(b:bat[:oid,:str],s:bat[:oid,:oid],pat:str,esc:str,caseignore:bit,anti:bit):bat[:oid,:oid] address PCRElikesubselect2; comment Select all head values of the first input BAT for which the tail value is "like" the given (SQL-style) pattern and for which the head value occurs in the tail of the second input BAT. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. -command algebra.likesubselect(b:bat[:oid,:str],pat:str,esc:str,caseignore:bit,anti:bit):bat[:oid,:oid] -address PCRElikesubselect1; -comment Select all head values for which the tail value is "like" the given (SQL-style) pattern. Input is a dense-headed BAT, output is a dense-headed BAT with in the tail the head value of the input BAT for which the relationship holds. The output BAT is sorted on the tail value. - command algebra.like(s:str,pat:str):bit address PCRElike2; command algebra.like(s:str,pat:str,esc:str):bit @@ -2747,10 +2738,6 @@ 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; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
