Changeset: a26e2cd33b85 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a26e2cd33b85 Added Files: monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.err monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_none_subselect.mal monetdb5/modules/mal/Tests/mosaic_none_subselect.stable.err monetdb5/modules/mal/Tests/mosaic_none_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_rle_subselect.mal monetdb5/modules/mal/Tests/mosaic_rle_subselect.stable.err monetdb5/modules/mal/Tests/mosaic_rle_subselect.stable.out Removed Files: monetdb5/modules/mal/Tests/mosaic_none_qry.mal monetdb5/modules/mal/Tests/mosaic_none_qry.stable.err monetdb5/modules/mal/Tests/mosaic_none_qry.stable.out monetdb5/modules/mal/Tests/mosaic_none_qry2.mal monetdb5/modules/mal/Tests/mosaic_rle_qry.mal monetdb5/modules/mal/Tests/mosaic_rle_qry.stable.err monetdb5/modules/mal/Tests/mosaic_rle_qry.stable.out monetdb5/modules/mal/Tests/mosaic_rle_qry2.mal Modified Files: monetdb5/modules/mal/Tests/All monetdb5/modules/mal/mosaic.c monetdb5/modules/mal/mosaic_hdr.c monetdb5/modules/mal/mosaic_none.c monetdb5/modules/mal/mosaic_rle.c Branch: mosaic Log Message:
Mosaic subselect with candidate lists diffs (truncated from 1486 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All --- a/monetdb5/modules/mal/Tests/All +++ b/monetdb5/modules/mal/Tests/All @@ -71,10 +71,9 @@ mosaic_none mosaic_rle mosaic_mix -mosaic_none_qry -mosaic_none_qry2 -mosaic_rle_qry -mosaic_rle_qry2 +mosaic_none_subselect +mosaic_rle_subselect +mosaic_mix_subselect #HAVE_RAPTOR?rdf # might show different output if openssl is compiled without full sha2 diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal @@ -0,0 +1,113 @@ +# OID list compressions + +o := 19531025:int; + +b:= bat.new(:oid,:int); +bat.append(b,0); +bat.append(b,1); +bat.append(b,2); +bat.append(b,3); +bat.append(b,188); +bat.append(b,50); +bat.append(b,50); +bat.append(b,48); +bat.append(b,1003); +bat.append(b,1002); +bat.append(b,1290); +bat.append(b,o); +bat.append(b,o); +bat.append(b,o); +bat.append(b,9); +bat.append(b,9); +bat.append(b,9); + +io.print(b); +x:= mosaic.compress(b); +mosaic.dump(x); + +s:= algebra.subselect(b,0,50,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,0,50,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,0,50,false,true,false); +io.print(s); +xs:= mosaic.subselect(x,0,50,false,true,false); +io.print(xs); + +s:= algebra.subselect(b,0,50,true,false,false); +io.print(s); +xs:= mosaic.subselect(x,0,50,true,false,false); +io.print(xs); + +s:= algebra.subselect(b,0,50,true,true,false); +io.print(s); +xs:= mosaic.subselect(x,0,50,true,true,false); +io.print(xs); + +s:= algebra.subselect(b,nil:int,50,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,nil:int,50,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,50,nil:int,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,50,nil:int,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,nil:int,nil:int,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,nil:int,nil:int,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,nil:int,nil:int,false,false,true); +io.print(s); +xs:= mosaic.subselect(x,nil:int,nil:int,false,false,true); +io.print(xs); + +# using candidatelists +c:= bat.new(:oid,:oid); +bat.append(c,2@0); +bat.append(c,5@0); +io.print(c); + +s:= algebra.subselect(b,c,0,50,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,c,0,50,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,c,0,50,false,true,false); +io.print(s); +xs:= mosaic.subselect(x,c,0,50,false,true,false); +io.print(xs); + +s:= algebra.subselect(b,c,0,50,true,false,false); +io.print(s); +xs:= mosaic.subselect(x,c,0,50,true,false,false); +io.print(xs); + +s:= algebra.subselect(b,c,0,50,true,true,false); +io.print(s); +xs:= mosaic.subselect(x,c,0,50,true,true,false); +io.print(xs); + +s:= algebra.subselect(b,c,nil:int,50,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,c,nil:int,50,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,c,50,nil:int,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,c,50,nil:int,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,c,nil:int,nil:int,false,false,false); +io.print(s); +xs:= mosaic.subselect(x,c,nil:int,nil:int,false,false,false); +io.print(xs); + +s:= algebra.subselect(b,c,nil:int,nil:int,false,false,true); +io.print(s); +xs:= mosaic.subselect(x,c,nil:int,nil:int,false,false,true); +io.print(xs); + diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.err b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_mix_subselect` in directory 'monetdb5/modules/mal` itself: + + +# 07:37:53 > +# 07:37:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30570" "--set" "mapi_usock=/var/tmp/mtest-327/.s.monetdb.30570" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_mix_subselect.mal" +# 07:37:53 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 30570 +# cmdline opt mapi_usock = /var/tmp/mtest-327/.s.monetdb.30570 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal +# cmdline opt gdk_debug = 536870922 + +# 07:37:53 > +# 07:37:53 > "Done." +# 07:37:53 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out @@ -0,0 +1,457 @@ +stdout of test 'mosaic_mix_subselect` in directory 'monetdb5/modules/mal` itself: + + +# 07:37:53 > +# 07:37:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30570" "--set" "mapi_usock=/var/tmp/mtest-327/.s.monetdb.30570" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_mix_subselect.mal" +# 07:37:53 > + +# MonetDB 5 server v11.20.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_modules_mal', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.591 GiB available main-memory. +# 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://vienna.ins.cwi.nl:30570/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-327/.s.monetdb.30570 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.main():void; +# OID list compressions + o := 19531025:int; + b := bat.new(:oid,:int); + bat.append(b,0); + bat.append(b,1); + bat.append(b,2); + bat.append(b,3); + bat.append(b,188); + bat.append(b,50); + bat.append(b,50); + bat.append(b,48); + bat.append(b,1003); + bat.append(b,1002); + bat.append(b,1290); + bat.append(b,o); + bat.append(b,o); + bat.append(b,o); + bat.append(b,9); + bat.append(b,9); + bat.append(b,9); + io.print(b); + x := mosaic.compress(b); + mosaic.dump(x); + s := algebra.subselect(b,0,50,false,false,false); + io.print(s); + xs := mosaic.subselect(x,0,50,false,false,false); + io.print(xs); + s := algebra.subselect(b,0,50,false,true,false); + io.print(s); + xs := mosaic.subselect(x,0,50,false,true,false); + io.print(xs); + s := algebra.subselect(b,0,50,true,false,false); + io.print(s); + xs := mosaic.subselect(x,0,50,true,false,false); + io.print(xs); + s := algebra.subselect(b,0,50,true,true,false); + io.print(s); + xs := mosaic.subselect(x,0,50,true,true,false); + io.print(xs); + s := algebra.subselect(b,nil:int,50,false,false,false); + io.print(s); + xs := mosaic.subselect(x,nil:int,50,false,false,false); + io.print(xs); + s := algebra.subselect(b,50,nil:int,false,false,false); + io.print(s); + xs := mosaic.subselect(x,50,nil:int,false,false,false); + io.print(xs); + s := algebra.subselect(b,nil:int,nil:int,false,false,false); + io.print(s); + xs := mosaic.subselect(x,nil:int,nil:int,false,false,false); + io.print(xs); + s := algebra.subselect(b,nil:int,nil:int,false,false,true); + io.print(s); + xs := mosaic.subselect(x,nil:int,nil:int,false,false,true); + io.print(xs); +# using candidatelists + c := bat.new(:oid,:oid); + bat.append(c,2@0); + bat.append(c,5@0); + io.print(c); + s := algebra.subselect(b,c,0,50,false,false,false); + io.print(s); + xs := mosaic.subselect(x,c,0,50,false,false,false); + io.print(xs); + s := algebra.subselect(b,c,0,50,false,true,false); + io.print(s); + xs := mosaic.subselect(x,c,0,50,false,true,false); + io.print(xs); + s := algebra.subselect(b,c,0,50,true,false,false); + io.print(s); + xs := mosaic.subselect(x,c,0,50,true,false,false); + io.print(xs); + s := algebra.subselect(b,c,0,50,true,true,false); + io.print(s); + xs := mosaic.subselect(x,c,0,50,true,true,false); + io.print(xs); + s := algebra.subselect(b,c,nil:int,50,false,false,false); + io.print(s); + xs := mosaic.subselect(x,c,nil:int,50,false,false,false); + io.print(xs); + s := algebra.subselect(b,c,50,nil:int,false,false,false); + io.print(s); + xs := mosaic.subselect(x,c,50,nil:int,false,false,false); + io.print(xs); + s := algebra.subselect(b,c,nil:int,nil:int,false,false,false); + io.print(s); + xs := mosaic.subselect(x,c,nil:int,nil:int,false,false,false); + io.print(xs); + s := algebra.subselect(b,c,nil:int,nil:int,false,false,true); + io.print(s); + xs := mosaic.subselect(x,c,nil:int,nil:int,false,false,true); + io.print(xs); +end main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 0 ] +[ 1@0, 1 ] +[ 2@0, 2 ] +[ 3@0, 3 ] +[ 4@0, 188 ] +[ 5@0, 50 ] +[ 6@0, 50 ] +[ 7@0, 48 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
