Changeset: ab970e868952 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab970e868952 Added Files: sql/backends/monet5/datacell/Tests/emilifinish.stable.err sql/backends/monet5/datacell/Tests/emilifinish.stable.out sql/backends/monet5/datacell/Tests/emilistart.sql sql/backends/monet5/datacell/Tests/emilistart.stable.err sql/backends/monet5/datacell/Tests/emilistart.stable.out Removed Files: monetdb5/modules/mal/Tests/pqueueElim.mal monetdb5/modules/mal/Tests/pqueueElim.stable.err monetdb5/modules/mal/Tests/pqueueElim.stable.out sql/backends/monet5/datacell/Tests/emili.sql Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_sphinxclient.stable.out clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/odbc/driver/SQLColAttribute.c monetdb5/modules/mal/Tests/All monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/pqueue.c monetdb5/modules/mal/pqueue.h monetdb5/modules/mal/pqueue.mal monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_pushselect.c sql/backends/monet5/datacell/Tests/All sql/backends/monet5/datacell/Tests/dcload.sql sql/backends/monet5/datacell/Tests/dcload.stable.err sql/backends/monet5/datacell/opt_datacell.c sql/backends/monet5/datacell/opt_datacell.h sql/backends/monet5/datacell/petrinet.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/sql_privileges.c sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/trace_nogeom.stable.out Branch: newstorage Log Message:
merged with default diffs (truncated from 3860 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 @@ -2667,13 +2667,9 @@ command algebra.sort(b:bat[:any_1,:any_2 address ALGhsort; comment Returns a BAT copy sorted on the head column. -command algebra.subsample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] -address ALGsubsample; -comment Return the oids of a random selection of size 'num' from the input BAT. - -command algebra.sample(b:bat[:oid,:any_2],num:int):bat[:oid,:any_2] +command algebra.sample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] address ALGsample; -comment Produce a random selection of size 'num' from the input BAT. +comment Returns the oids of a random selection of size 'num' from the input BAT. command algebra.subslice(b:bat[:oid,:any_1],x:wrd,y:wrd):bat[:oid,:oid] address ALGsubslice_wrd; @@ -41022,12 +41018,20 @@ command pcre.select(pat:str,strs:bat[:oi address PCREselectDef; comment Select tuples based on the pattern +pattern pqueue.topn_max(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination + +pattern pqueue.topn_min(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a min-pqueue with/without duplicate elimination + pattern pqueue.topn_max(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_max; -comment Return the top n elements using a min-pqueue with/without duplicate elimination +address PQtopn_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination pattern pqueue.topn_min(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_min; +address PQtopn_minmax; comment Return the top n elements using a min-pqueue with/without duplicate elimination command pqueue.topn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] @@ -41086,6 +41090,10 @@ command pqueue.topn_min(t:bat[:oid,:bte] address PQtopn_btemin; comment Return the topn elements of the bat t using a min-pqueue +pattern pqueue.utopn_min(b:bat[:oid,:any_1],n:wrd,elim:bit) (bp:bat[:oid,:oid],bg:bat[:oid,:any_1]) +address PQutopn_minmax; +comment to be defined + command pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] address PQutopn2_anymax; comment Return the unique topn elements of the bat t using a max-pqueue @@ -41388,18 +41396,14 @@ pattern recycle.setCache(clines:int):voi address RECYCLEsetCache; comment Set recycler cache line parameter -command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] -address SAMPLEsubuniform; +command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid] +address SAMPLEuniform_dbl; +comment Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 + +command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] +address SAMPLEuniform; comment Returns the oids of a uniform sample of size s -command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:any] -address SAMPLEuniform_dbl; -comment Returns a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 - -command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:any] -address SAMPLEuniform; -comment Returns a uniform sample of size s - command sabaoth.epilogue():void address SABepilogue; comment Release the resources held by the sabaoth module @@ -41764,22 +41768,6 @@ pattern sql.eval(cmd:str):void address SQLstatement; comment Compile and execute a single sql statement -pattern sql.gzexpand(sch:str,tbl:str):void -address SQLexpand; -comment Remove the compressed image - -pattern sql.gztruncate(sch:str,tbl:str):void -address SQLtruncate; -comment Remove the tables when you have a compressed image - -pattern sql.gzdecompress(sch:str,tbl:str):void -address SQLgzdecompress; -comment Perform LZ decompression on a table - -pattern sql.gzcompress(sch:str,tbl:str):void -address SQLgzcompress; -comment Perform LZ compression on a table - command sql.getVersion(clientid:int):lng address mvc_getVersion; comment Return the database version identifier for a client diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out --- a/clients/Tests/MAL-signatures_gsl.stable.out +++ b/clients/Tests/MAL-signatures_gsl.stable.out @@ -2667,13 +2667,9 @@ command algebra.sort(b:bat[:any_1,:any_2 address ALGhsort; comment Returns a BAT copy sorted on the head column. -command algebra.subsample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] -address ALGsubsample; -comment Return the oids of a random selection of size 'num' from the input BAT. - -command algebra.sample(b:bat[:oid,:any_2],num:int):bat[:oid,:any_2] +command algebra.sample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] address ALGsample; -comment Produce a random selection of size 'num' from the input BAT. +comment Returns the oids of a random selection of size 'num' from the input BAT. command algebra.subslice(b:bat[:oid,:any_1],x:wrd,y:wrd):bat[:oid,:oid] address ALGsubslice_wrd; @@ -41038,12 +41034,20 @@ command pcre.select(pat:str,strs:bat[:oi address PCREselectDef; comment Select tuples based on the pattern +pattern pqueue.topn_max(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination + +pattern pqueue.topn_min(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a min-pqueue with/without duplicate elimination + pattern pqueue.topn_max(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_max; -comment Return the top n elements using a min-pqueue with/without duplicate elimination +address PQtopn_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination pattern pqueue.topn_min(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_min; +address PQtopn_minmax; comment Return the top n elements using a min-pqueue with/without duplicate elimination command pqueue.topn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] @@ -41102,6 +41106,10 @@ command pqueue.topn_min(t:bat[:oid,:bte] address PQtopn_btemin; comment Return the topn elements of the bat t using a min-pqueue +pattern pqueue.utopn_min(b:bat[:oid,:any_1],n:wrd,elim:bit) (bp:bat[:oid,:oid],bg:bat[:oid,:any_1]) +address PQutopn_minmax; +comment to be defined + command pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] address PQutopn2_anymax; comment Return the unique topn elements of the bat t using a max-pqueue @@ -41404,18 +41412,14 @@ pattern recycle.setCache(clines:int):voi address RECYCLEsetCache; comment Set recycler cache line parameter -command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] -address SAMPLEsubuniform; +command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid] +address SAMPLEuniform_dbl; +comment Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 + +command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] +address SAMPLEuniform; comment Returns the oids of a uniform sample of size s -command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:any] -address SAMPLEuniform_dbl; -comment Returns a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 - -command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:any] -address SAMPLEuniform; -comment Returns a uniform sample of size s - command sabaoth.epilogue():void address SABepilogue; comment Release the resources held by the sabaoth module @@ -41780,22 +41784,6 @@ pattern sql.eval(cmd:str):void address SQLstatement; comment Compile and execute a single sql statement -pattern sql.gzexpand(sch:str,tbl:str):void -address SQLexpand; -comment Remove the compressed image - -pattern sql.gztruncate(sch:str,tbl:str):void -address SQLtruncate; -comment Remove the tables when you have a compressed image - -pattern sql.gzdecompress(sch:str,tbl:str):void -address SQLgzdecompress; -comment Perform LZ decompression on a table - -pattern sql.gzcompress(sch:str,tbl:str):void -address SQLgzcompress; -comment Perform LZ compression on a table - command sql.getVersion(clientid:int):lng address mvc_getVersion; comment Return the database version identifier for a client 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 @@ -2667,13 +2667,9 @@ command algebra.sort(b:bat[:any_1,:any_2 address ALGhsort; comment Returns a BAT copy sorted on the head column. -command algebra.subsample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] -address ALGsubsample; -comment Return the oids of a random selection of size 'num' from the input BAT. - -command algebra.sample(b:bat[:oid,:any_2],num:int):bat[:oid,:any_2] +command algebra.sample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid] address ALGsample; -comment Produce a random selection of size 'num' from the input BAT. +comment Returns the oids of a random selection of size 'num' from the input BAT. command algebra.subslice(b:bat[:oid,:any_1],x:wrd,y:wrd):bat[:oid,:oid] address ALGsubslice_wrd; @@ -40998,12 +40994,20 @@ command pcre.select(pat:str,strs:bat[:oi address PCREselectDef; comment Select tuples based on the pattern +pattern pqueue.topn_max(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination + +pattern pqueue.topn_min(a:bat[:oid,:oid],b:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] +address PQtopn2_minmax; +comment Return the top n elements using a min-pqueue with/without duplicate elimination + pattern pqueue.topn_max(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_max; -comment Return the top n elements using a min-pqueue with/without duplicate elimination +address PQtopn_minmax; +comment Return the top n elements using a max-pqueue with/without duplicate elimination pattern pqueue.topn_min(a:bat[:oid,:any_1],n:wrd,elim:bit):bat[:oid,:oid] -address PQtopn_min; +address PQtopn_minmax; comment Return the top n elements using a min-pqueue with/without duplicate elimination command pqueue.topn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] @@ -41062,6 +41066,10 @@ command pqueue.topn_min(t:bat[:oid,:bte] address PQtopn_btemin; comment Return the topn elements of the bat t using a min-pqueue +pattern pqueue.utopn_min(b:bat[:oid,:any_1],n:wrd,elim:bit) (bp:bat[:oid,:oid],bg:bat[:oid,:any_1]) +address PQutopn_minmax; +comment to be defined + command pqueue.utopn_max(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] address PQutopn2_anymax; comment Return the unique topn elements of the bat t using a max-pqueue @@ -41364,18 +41372,14 @@ pattern recycle.setCache(clines:int):voi address RECYCLEsetCache; comment Set recycler cache line parameter -command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] -address SAMPLEsubuniform; +command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid] +address SAMPLEuniform_dbl; +comment Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 + +command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid] +address SAMPLEuniform; comment Returns the oids of a uniform sample of size s -command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:any] -address SAMPLEuniform_dbl; -comment Returns a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0 - -command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:any] -address SAMPLEuniform; -comment Returns a uniform sample of size s - command sabaoth.epilogue():void address SABepilogue; comment Release the resources held by the sabaoth module @@ -41740,22 +41744,6 @@ pattern sql.eval(cmd:str):void address SQLstatement; comment Compile and execute a single sql statement -pattern sql.gzexpand(sch:str,tbl:str):void -address SQLexpand; -comment Remove the compressed image - -pattern sql.gztruncate(sch:str,tbl:str):void -address SQLtruncate; -comment Remove the tables when you have a compressed image - -pattern sql.gzdecompress(sch:str,tbl:str):void -address SQLgzdecompress; -comment Perform LZ decompression on a table - -pattern sql.gzcompress(sch:str,tbl:str):void _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
