Changeset: 09dcf82952ce for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09dcf82952ce Added Files: geom/sql/Tests/T1.reqtests geom/sql/Tests/T1.stable.err geom/sql/Tests/T1.stable.out geom/sql/Tests/T10.reqtests geom/sql/Tests/T11.reqtests geom/sql/Tests/T12.reqtests geom/sql/Tests/T13.reqtests geom/sql/Tests/T13.stable.err geom/sql/Tests/T13.stable.out geom/sql/Tests/T14.reqtests geom/sql/Tests/T14.stable.err geom/sql/Tests/T14.stable.out geom/sql/Tests/T15.reqtests geom/sql/Tests/T15.stable.err geom/sql/Tests/T15.stable.out geom/sql/Tests/T16.reqtests geom/sql/Tests/T17.reqtests geom/sql/Tests/T17.stable.err geom/sql/Tests/T17.stable.out geom/sql/Tests/T18.reqtests geom/sql/Tests/T18.stable.err geom/sql/Tests/T18.stable.out geom/sql/Tests/T19.reqtests geom/sql/Tests/T19.stable.err geom/sql/Tests/T19.stable.out geom/sql/Tests/T2.reqtests geom/sql/Tests/T2.stable.err geom/sql/Tests/T2.stable.out geom/sql/Tests/T20.reqtests geom/sql/Tests/T20.stable.err geom/sql/Tests/T20.stable.out geom/sql/Tests/T21.reqtests geom/sql/Tests/T22.reqtests geom/sql/Tests/T22.stable.err geom/sql/Tests/T22.stable.out geom/sql/Tests/T23.reqtests geom/sql/Tests/T23.stable.err geom/sql/Tests/T23.stable.out geom/sql/Tests/T24.reqtests geom/sql/Tests/T24.stable.err geom/sql/Tests/T24.stable.out geom/sql/Tests/T25.reqtests geom/sql/Tests/T25.stable.err geom/sql/Tests/T25.stable.out geom/sql/Tests/T26.reqtests geom/sql/Tests/T27.reqtests geom/sql/Tests/T27.stable.err geom/sql/Tests/T27.stable.out geom/sql/Tests/T28.reqtests geom/sql/Tests/T28.stable.err geom/sql/Tests/T28.stable.out geom/sql/Tests/T29.reqtests geom/sql/Tests/T29.stable.err geom/sql/Tests/T29.stable.out geom/sql/Tests/T3.reqtests geom/sql/Tests/T3.stable.err geom/sql/Tests/T3.stable.out geom/sql/Tests/T30.reqtests geom/sql/Tests/T30.stable.err geom/sql/Tests/T30.stable.out geom/sql/Tests/T31.reqtests geom/sql/Tests/T31.stable.err geom/sql/Tests/T31.stable.out geom/sql/Tests/T32.reqtests geom/sql/Tests/T32.stable.err geom/sql/Tests/T32.stable.out geom/sql/Tests/T33.reqtests geom/sql/Tests/T34.reqtests geom/sql/Tests/T34.stable.err geom/sql/Tests/T34.stable.out geom/sql/Tests/T35.reqtests geom/sql/Tests/T35.stable.err geom/sql/Tests/T35.stable.out geom/sql/Tests/T36.reqtests geom/sql/Tests/T36.sql geom/sql/Tests/T36.stable.err geom/sql/Tests/T36.stable.out geom/sql/Tests/T37.reqtests geom/sql/Tests/T38.reqtests geom/sql/Tests/T39.reqtests geom/sql/Tests/T4.reqtests geom/sql/Tests/T4.stable.err geom/sql/Tests/T4.stable.out geom/sql/Tests/T40.reqtests geom/sql/Tests/T41.reqtests geom/sql/Tests/T42.reqtests geom/sql/Tests/T43.reqtests geom/sql/Tests/T43.stable.err geom/sql/Tests/T43.stable.out geom/sql/Tests/T44.reqtests geom/sql/Tests/T45.reqtests geom/sql/Tests/T46.reqtests geom/sql/Tests/T47.reqtests geom/sql/Tests/T48.reqtests geom/sql/Tests/T49.reqtests geom/sql/Tests/T49.stable.err geom/sql/Tests/T49.stable.out geom/sql/Tests/T5.reqtests geom/sql/Tests/T50.reqtests geom/sql/Tests/T51.reqtests geom/sql/Tests/T52.reqtests geom/sql/Tests/T6.reqtests geom/sql/Tests/T7.reqtests geom/sql/Tests/T7.stable.err geom/sql/Tests/T7.stable.out geom/sql/Tests/T8.reqtests geom/sql/Tests/T9.reqtests geom/sql/Tests/T9.stable.err geom/sql/Tests/T9.stable.out geom/sql/Tests/binary.sql geom/sql/Tests/binary.stable.err geom/sql/Tests/binary.stable.out geom/sql/Tests/conformance_drop.sql geom/sql/Tests/conformance_drop.stable.err geom/sql/Tests/conformance_drop.stable.out geom/sql/Tests/conformance_load.sql geom/sql/Tests/conformance_load.stable.err geom/sql/Tests/conformance_load.stable.out geom/sql/Tests/normalized.sql geom/sql/Tests/normalized.stable.err geom/sql/Tests/normalized.stable.out Removed Files: geom/sql/Tests/ogc_conformance.sql geom/sql/Tests/ogc_conformance.stable.err geom/sql/Tests/ogc_conformance.stable.out geom/sql/Tests/ogc_destroy.sql geom/sql/Tests/ogc_destroy.stable.err geom/sql/Tests/ogc_destroy.stable.out geom/sql/Tests/ogc_dropconformance.sql geom/sql/Tests/ogc_dropconformance.stable.err geom/sql/Tests/ogc_dropconformance.stable.out geom/sql/Tests/ogc_geometry.sql geom/sql/Tests/ogc_load.sql geom/sql/Tests/ogc_load.stable.err geom/sql/Tests/ogc_load.stable.out geom/sql/Tests/ogc_schema.sql geom/sql/Tests/ogc_schema.stable.err geom/sql/Tests/ogc_schema.stable.out geom/sql/Tests/ogc_test.sql geom/sql/Tests/ogc_test.stable.err geom/sql/Tests/ogc_test.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_nogeom.stable.out geom/sql/Tests/All geom/sql/Tests/T1.sql geom/sql/Tests/T10.sql geom/sql/Tests/T10.stable.err geom/sql/Tests/T10.stable.out geom/sql/Tests/T11.sql geom/sql/Tests/T11.stable.err geom/sql/Tests/T11.stable.out geom/sql/Tests/T12.sql geom/sql/Tests/T12.stable.err geom/sql/Tests/T12.stable.out geom/sql/Tests/T13.sql geom/sql/Tests/T14.sql geom/sql/Tests/T15.sql geom/sql/Tests/T16.sql geom/sql/Tests/T16.stable.err geom/sql/Tests/T16.stable.out geom/sql/Tests/T17.sql geom/sql/Tests/T18.sql geom/sql/Tests/T19.sql geom/sql/Tests/T2.sql geom/sql/Tests/T20.sql geom/sql/Tests/T21.sql geom/sql/Tests/T21.stable.err geom/sql/Tests/T21.stable.out geom/sql/Tests/T22.sql geom/sql/Tests/T23.sql geom/sql/Tests/T24.sql geom/sql/Tests/T25.sql geom/sql/Tests/T26.sql geom/sql/Tests/T26.stable.err geom/sql/Tests/T26.stable.out geom/sql/Tests/T27.sql geom/sql/Tests/T28.sql geom/sql/Tests/T29.sql geom/sql/Tests/T3.sql geom/sql/Tests/T30.sql geom/sql/Tests/T31.sql geom/sql/Tests/T32.sql geom/sql/Tests/T33.sql geom/sql/Tests/T33.stable.err geom/sql/Tests/T33.stable.out geom/sql/Tests/T34.sql geom/sql/Tests/T35.sql geom/sql/Tests/T37.sql geom/sql/Tests/T37.stable.err geom/sql/Tests/T37.stable.out geom/sql/Tests/T38.sql geom/sql/Tests/T38.stable.err geom/sql/Tests/T38.stable.out geom/sql/Tests/T39.sql geom/sql/Tests/T39.stable.err geom/sql/Tests/T39.stable.out geom/sql/Tests/T4.sql geom/sql/Tests/T40.sql geom/sql/Tests/T40.stable.err geom/sql/Tests/T40.stable.out geom/sql/Tests/T41.sql geom/sql/Tests/T41.stable.err geom/sql/Tests/T41.stable.out geom/sql/Tests/T42.sql geom/sql/Tests/T42.stable.err geom/sql/Tests/T42.stable.out geom/sql/Tests/T43.sql geom/sql/Tests/T44.sql geom/sql/Tests/T44.stable.err geom/sql/Tests/T44.stable.out geom/sql/Tests/T45.sql geom/sql/Tests/T45.stable.err geom/sql/Tests/T45.stable.out geom/sql/Tests/T46.sql geom/sql/Tests/T46.stable.err geom/sql/Tests/T46.stable.out geom/sql/Tests/T47.sql geom/sql/Tests/T47.stable.err geom/sql/Tests/T47.stable.out geom/sql/Tests/T48.sql geom/sql/Tests/T48.stable.err geom/sql/Tests/T48.stable.out geom/sql/Tests/T49.sql geom/sql/Tests/T5.sql geom/sql/Tests/T5.stable.err geom/sql/Tests/T5.stable.out geom/sql/Tests/T50.sql geom/sql/Tests/T50.stable.err geom/sql/Tests/T50.stable.out geom/sql/Tests/T51.sql geom/sql/Tests/T51.stable.err geom/sql/Tests/T51.stable.out geom/sql/Tests/T52.sql geom/sql/Tests/T52.stable.err geom/sql/Tests/T52.stable.out geom/sql/Tests/T6.sql geom/sql/Tests/T6.stable.err geom/sql/Tests/T6.stable.out geom/sql/Tests/T7.sql geom/sql/Tests/T8.sql geom/sql/Tests/T8.stable.err geom/sql/Tests/T8.stable.out geom/sql/Tests/T9.sql Branch: newstorage Log Message:
merge with default diffs (truncated from 14006 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -2415,7 +2415,7 @@ 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.ilikesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCREilike_join_pcre; +address PCREilike_join_pcr5; 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.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3] @@ -3021,14 +3021,6 @@ command batstr.like(s:bat[:oid,:str],pat address BATPCRElike2; command batstr.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] address BATPCRElike; -command batstr.like_uselect(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:void] -address STRbatlike_uselect; -comment Perform SQL like operation against a string bat - -command batstr.like_uselect(s:bat[:oid,:str],pat:str):bat[:oid,:void] -address STRbatlike_uselect2; -comment Perform SQL like operation against a string bat - command batstr.ltrim(s:bat[:oid,:str]):bat[:oid,:str] address STRbatLtrim; comment Strip whitespaces from start of a string. @@ -3049,10 +3041,6 @@ command batstr.nbytes(s:bat[:oid,:str]): address STRbatBytes; comment Return the string length in bytes. -command batstr.replace(s:bat[:oid,:str],pat:str,s2:str):bat[:oid,:str] -address STRbatreplace; -comment Insert a string into another - command batstr.r_search(s:bat[:oid,:str],c:str):bat[:oid,:int] address STRbatRstrSearchcst; comment Reverse search for a substring. Returns position, -1 if not found. @@ -32082,18 +32070,6 @@ pattern bbp.bind(name:str):bat[:oid,:any address CMDbbpbind; comment Locate the BAT using its logical name -command bbp.compress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpcompress; -comment Generate a compressed image of the BAT on a specific file - -command bbp.decompress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpdecompress; -comment Obtain a temporary decompressed image of a BAT from a specific file - -command bbp.expand(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpexpand; -comment Expand a compressed image of BAT heaps - command bbp.getPageSize():int address CMDgetPageSize; comment Obtain the memory page size @@ -32158,10 +32134,6 @@ command bbp.getIndex(b:bat[:oid,:any_2]) address CMDbbpgetIndex; comment Retrieve the index in the BBP -command bbp.truncate(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbptruncate; -comment Truncate the heaps if a compressed image exist - command blob.blob(s:str):blob address BLOBblob_fromstr; command blob.blob(s:blob):blob @@ -39651,30 +39623,6 @@ pattern language.source(f:str):void address CMDevalFile; comment Merge the instructions stored in the file with the current program. -command lock.create():lock -address LCKcreate; -comment Create an unset lock - -command lock.destroy(l:lock):void -address LCKdestroy; -comment Destroy a lock - -command lock.set(l:lock):void -address LCKset; -comment Try to set a lock. If set, block till it is freed - -command lock.tostr(l:lock):void -address lockToStr; -comment Overloaded atom function - -command lock.try(l:lock):int -address LCKtry; -comment Try a lock. If free set it, if not return EBUSY - -command lock.unset(l:lock):void -address LCKunset; -comment Unset a lock - command lsst.angsep(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl address qserv_angSep; comment Returns the angular separation in degrees between two sphericalcoordinate pairs (ra1,dec1) and (ra2,dec2) @@ -40758,12 +40706,6 @@ comment Duplicate constant removal optim pattern optimizer.constants():str address OPTwrapper; -pattern optimizer.compression(mod:str,fcn:str):str -address OPTwrapper; -comment Compression code injection - -pattern optimizer.compression():str -address OPTwrapper; pattern optimizer.commonTerms(mod:any_1,fcn:any_2):str address OPTwrapper; comment Common sub-expression optimizer @@ -41038,57 +40980,22 @@ comment Collect trace of a specific oper pattern optimizer.trace():str address OPTwrapper; -command pcre.compile(pat:str):pcre -address PCREcompile_wrap; -comment compile a pattern - -command pcre.#del():void -address pcre_del; -command pcre.#fromstr():void -address pcre_fromstr; -command pcre.#heap():void -address pcre_heap; -command pcre.#hash():void -address pcre_hash; command pcre.imatch(s:str,pat:str):bit address PCREimatch; comment Caseless Perl Compatible Regular Expression pattern matching against a string -function pcre.ilike_filter(s:bat[:oid,:str],pat:str):bat[:oid,:str]; -command pcre.ilike_select(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:str] -address PCREilike_select_pcre; command pcre.ilikesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address PCREilike_join_pcre; -command pcre.ilike_filter(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] -address PCREilike_uselect_pcre; -command pcre.ilike_uselect(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] -address PCREilike_uselect_pcre; command pcre.index(pat:pcre,s:str):int address PCREindex; comment match a pattern, return matched position (or 0 when not found) -command pcre.like_select(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:str] -address PCRElike_select_pcre; command pcre.likesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address PCRElike_join_pcre; -command pcre.like_filter(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] -address PCRElike_uselect_pcre; -command pcre.like_uselect(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:oid] -address PCRElike_uselect_pcre; -command pcre.#length():void -address pcre_length; command pcre.match(s:str,pat:str):bit address PCREmatch; comment Perl Compatible Regular Expression pattern matching against a string -command pcre.match(pat:pcre,s:str):bit -address PCREexec_wrap; -comment match a pattern - -command pcre.#null():void -address pcre_null; -command pcre.#nequal():void -address pcre_nequal; pattern pcre.prelude():void address pcre_init; comment Initialize pcre @@ -41101,8 +41008,6 @@ command pcre.patindex(pat:str,s:str):int address PCREpatindex; comment Location of the first POSIX pattern matching against a string -command pcre.#put():void -address pcre_put; command pcre.replace(orig:bat[:oid,:str],pat:str,repl:str,flag:str):bat[:oid,:str] address PCREreplace_bat_wrap; command pcre.replace(origin:str,pat:str,repl:str,flags:str):str @@ -41117,12 +41022,6 @@ command pcre.select(pat:str,strs:bat[:oi address PCREselectDef; comment Select tuples based on the pattern -command pcre.#tostr():void -address pcre_tostr; -command pcre.uselect(pat:str,strs:bat[:oid,:str]):bat[:oid,:oid] -address PCREuselectDef; -comment Select tuples based on the pattern, only returning the head - command pqueue.dequeue_max(h:bat[:oid,:any_1]):void address PQdequeue_anymax; comment Removes top element of the max-pqueue and updates it @@ -41701,22 +41600,6 @@ pattern scheduler.volumeCost(a:any):lng address RUNvolumeCost; comment A sample cost function based on materialized results -command sema.create(init:int):sema -address SEMAcreate; -comment Create an unset sema, with an initial value - -command sema.destroy(s:sema):void -address SEMAdestroy; -comment Destroy a semaphore - -command sema.down(s:sema):void -address SEMAdown; -comment Decrement the semaphpore if >0; else block - -command sema.up(s:sema):void -address SEMAup; -comment Increment the semaphore - command sql.alpha(dec:dbl,theta:dbl):dbl address SQLcst_alpha_cst; comment Implementation of astronomy alpha function: expands the radius theta depending on the declination @@ -42384,6 +42267,8 @@ command str.prefix(s:str,l:int):str address STRprefix; comment Extract the prefix of a given length +command str.replace(origin:str,pat:str,repl:str,flags:str):str +address PCREreplace_wrap; command str.repeat(s2:str,c:int):str address STRrepeat; command str.replace(s:str,pat:str,s2:str):str diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out @@ -2415,7 +2415,7 @@ 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.ilikesubselect(s:bat[:oid,:str],pat:bat[:oid,:str],esc:str) (l:bat[:oid,:oid],r:bat[:oid,:oid]) -address PCREilike_join_pcre; +address PCREilike_join_pcr5; 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.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3] @@ -3021,14 +3021,6 @@ command batstr.like(s:bat[:oid,:str],pat address BATPCRElike2; command batstr.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] address BATPCRElike; -command batstr.like_uselect(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:void] -address STRbatlike_uselect; -comment Perform SQL like operation against a string bat - -command batstr.like_uselect(s:bat[:oid,:str],pat:str):bat[:oid,:void] -address STRbatlike_uselect2; -comment Perform SQL like operation against a string bat - command batstr.ltrim(s:bat[:oid,:str]):bat[:oid,:str] address STRbatLtrim; comment Strip whitespaces from start of a string. @@ -3049,10 +3041,6 @@ command batstr.nbytes(s:bat[:oid,:str]): address STRbatBytes; comment Return the string length in bytes. -command batstr.replace(s:bat[:oid,:str],pat:str,s2:str):bat[:oid,:str] -address STRbatreplace; -comment Insert a string into another - command batstr.r_search(s:bat[:oid,:str],c:str):bat[:oid,:int] address STRbatRstrSearchcst; comment Reverse search for a substring. Returns position, -1 if not found. @@ -32082,18 +32070,6 @@ pattern bbp.bind(name:str):bat[:oid,:any address CMDbbpbind; comment Locate the BAT using its logical name -command bbp.compress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpcompress; -comment Generate a compressed image of the BAT on a specific file - -command bbp.decompress(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpdecompress; -comment Obtain a temporary decompressed image of a BAT from a specific file - -command bbp.expand(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbpexpand; -comment Expand a compressed image of BAT heaps - command bbp.getPageSize():int address CMDgetPageSize; comment Obtain the memory page size @@ -32158,10 +32134,6 @@ command bbp.getIndex(b:bat[:oid,:any_2]) address CMDbbpgetIndex; comment Retrieve the index in the BBP -command bbp.truncate(b:bat[:oid,:any_2],fnme:str):bat[:oid,:any_2] -address CMDbbptruncate; -comment Truncate the heaps if a compressed image exist - command blob.blob(s:str):blob address BLOBblob_fromstr; command blob.blob(s:blob):blob @@ -39627,30 +39599,6 @@ pattern language.source(f:str):void address CMDevalFile; comment Merge the instructions stored in the file with the current program. -command lock.create():lock -address LCKcreate; -comment Create an unset lock - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
