Changeset: f3103aa36f2e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3103aa36f2e Added Files: monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.err monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.stable.err monetdb5/modules/mal/Tests/mosaic_none_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.stable.err monetdb5/modules/mal/Tests/mosaic_rle_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_view_subselect.mal Modified Files: monetdb5/modules/mal/Tests/All 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 monetdb5/modules/mal/mosaic.c monetdb5/modules/mal/mosaic.mal monetdb5/modules/mal/mosaic_none.c monetdb5/modules/mal/mosaic_rle.c Branch: mosaic Log Message:
Handling compressed thetasubselect diffs (truncated from 1888 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 @@ -74,6 +74,10 @@ mosaic_mix mosaic_none_subselect mosaic_rle_subselect mosaic_mix_subselect + +mosaic_none_thetasubselect +mosaic_rle_thetasubselect +mosaic_mix_thetasubselect #HAVE_RAPTOR?rdf # might show different output if openssl is compiled without full sha2 diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal @@ -0,0 +1,93 @@ +# 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.thetasubselect(b,50,"<"); +io.print(s); +xs:= mosaic.thetasubselect(x,50,"<"); +io.print(xs); + +s:= algebra.thetasubselect(b,50,"<="); +io.print(s); +xs:= mosaic.thetasubselect(x,50,"<="); +io.print(xs); + +s:= algebra.thetasubselect(b,50,">"); +io.print(s); +xs:= mosaic.thetasubselect(x,50,">"); +io.print(xs); + +s:= algebra.thetasubselect(b,50,">="); +io.print(s); +xs:= mosaic.thetasubselect(x,50,">="); +io.print(xs); + +s:= algebra.thetasubselect(b,50,"=="); +io.print(s); +xs:= mosaic.thetasubselect(x,50,"=="); +io.print(xs); + +s:= algebra.thetasubselect(b,50,"!="); +io.print(s); +xs:= mosaic.thetasubselect(x,50,"!="); +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.thetasubselect(b,c,50,"<"); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,"<"); +io.print(xs); + +s:= algebra.thetasubselect(b,c,50,"<="); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,"<="); +io.print(xs); + +s:= algebra.thetasubselect(b,c,50,">"); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,">"); +io.print(xs); + +s:= algebra.thetasubselect(b,c,50,">="); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,">="); +io.print(xs); + +s:= algebra.thetasubselect(b,c,50,"=="); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,"=="); +io.print(xs); + +s:= algebra.thetasubselect(b,c,50,"!="); +io.print(s); +xs:= mosaic.thetasubselect(x,c,50,"!="); +io.print(xs); + diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.err b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_mix_thetasubselect` in directory 'monetdb5/modules/mal` itself: + + +# 15:47:17 > +# 15:47:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35309" "--set" "mapi_usock=/var/tmp/mtest-14418/.s.monetdb.35309" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_mix_thetasubselect.mal" +# 15:47:17 > + +# 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 = 35309 +# cmdline opt mapi_usock = /var/tmp/mtest-14418/.s.monetdb.35309 +# 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 + +# 15:47:17 > +# 15:47:17 > "Done." +# 15:47:17 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.out @@ -0,0 +1,373 @@ +stdout of test 'mosaic_mix_thetasubselect` in directory 'monetdb5/modules/mal` itself: + + +# 15:47:17 > +# 15:47:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35309" "--set" "mapi_usock=/var/tmp/mtest-14418/.s.monetdb.35309" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_mix_thetasubselect.mal" +# 15:47:17 > + +# 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:35309/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-14418/.s.monetdb.35309 +# 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.thetasubselect(b,50,"<"); + io.print(s); + xs := mosaic.thetasubselect(x,50,"<"); + io.print(xs); + s := algebra.thetasubselect(b,50,"<="); + io.print(s); + xs := mosaic.thetasubselect(x,50,"<="); + io.print(xs); + s := algebra.thetasubselect(b,50,">"); + io.print(s); + xs := mosaic.thetasubselect(x,50,">"); + io.print(xs); + s := algebra.thetasubselect(b,50,">="); + io.print(s); + xs := mosaic.thetasubselect(x,50,">="); + io.print(xs); + s := algebra.thetasubselect(b,50,"=="); + io.print(s); + xs := mosaic.thetasubselect(x,50,"=="); + io.print(xs); + s := algebra.thetasubselect(b,50,"!="); + io.print(s); + xs := mosaic.thetasubselect(x,50,"!="); + 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.thetasubselect(b,c,50,"<"); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,"<"); + io.print(xs); + s := algebra.thetasubselect(b,c,50,"<="); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,"<="); + io.print(xs); + s := algebra.thetasubselect(b,c,50,">"); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,">"); + io.print(xs); + s := algebra.thetasubselect(b,c,50,">="); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,">="); + io.print(xs); + s := algebra.thetasubselect(b,c,50,"=="); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,"=="); + io.print(xs); + s := algebra.thetasubselect(b,c,50,"!="); + io.print(s); + xs := mosaic.thetasubselect(x,c,50,"!="); + 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 ] +[ 8@0, 1003 ] +[ 9@0, 1002 ] +[ 10@0, 1290 ] +[ 11@0, 19531025 ] +[ 12@0, 19531025 ] +[ 13@0, 19531025 ] +[ 14@0, 9 ] +[ 15@0, 9 ] +[ 16@0, 9 ] +#header block version 20140808 +#index top 1 +#[0] 5 100 +#header block version 20140808 +#index top 2 +#[0] 5 100 +#[1] 7 112 +#header block version 20140808 +#index top 3 +#[0] 5 100 +#[1] 7 112 +#[2] 11 136 +#ditch entry 1 +#header block version 20140808 +#index top 3 +#[0] 5 100 +#[1] 11 136 +#[2] 14 148 +#ditch entry 2 +#header block version 20140808 +#index top 3 +#[0] 5 100 +#[1] 11 136 +#[2] 17 160 +#type 5 todo 0 +#wins 11 11 0 0 0 0 0 +#elms 9 8 0 0 0 0 0 +#time 0 1 0 0 0 0 0 +#perc 0 0 0 0 0 0 0 +#none 5 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
