Changeset: 84bb86c1d4dd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84bb86c1d4dd Added Files: monetdb5/modules/mal/Tests/mosaic_none_double.mal monetdb5/modules/mal/Tests/mosaic_none_double.stable.err monetdb5/modules/mal/Tests/mosaic_none_double.stable.out monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.mal monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.err monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.out monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.mal monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.stable.err monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.stable.out Modified Files: monetdb5/modules/mal/Tests/All monetdb5/modules/mal/mosaic.c monetdb5/modules/mal/mosaic_none.c monetdb5/modules/mal/mosaic_rle.c Branch: mosaic Log Message:
Add leftfetchjoin on int mosaic diffs (truncated from 728 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,6 +71,8 @@ mosaic_none mosaic_rle mosaic_mix +mosaic_none_double + mosaic_none_subselect mosaic_rle_subselect mosaic_mix_subselect @@ -78,6 +80,10 @@ mosaic_mix_subselect mosaic_none_thetasubselect mosaic_rle_thetasubselect mosaic_mix_thetasubselect + +mosaic_none_fetchjoin +mosaic_rle_fetchjoin + #HAVE_RAPTOR?rdf # might show different output if openssl is compiled without full sha2 diff --git a/monetdb5/modules/mal/Tests/mosaic_none_double.mal b/monetdb5/modules/mal/Tests/mosaic_none_double.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_double.mal @@ -0,0 +1,16 @@ +b:= bat.new(:oid,:int); +bat.append(b,50); +bat.append(b,19531015); +bat.append(b,9); +b:= bat.append(b,b); + +io.print(b); +x:= mosaic.compress(b); +mosaic.dump(x); +xd := mosaic.decompress(x); +io.print(xd); + +z:= mosaic.compress(x); +mosaic.dump(z); +zd := mosaic.decompress(z); +io.print(zd); diff --git a/monetdb5/modules/mal/Tests/mosaic_none_double.stable.err b/monetdb5/modules/mal/Tests/mosaic_none_double.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_double.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_none_double` in directory 'monetdb5/modules/mal` itself: + + +# 20:52:03 > +# 20:52:03 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39521" "--set" "mapi_usock=/var/tmp/mtest-18930/.s.monetdb.39521" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_none_double.mal" +# 20:52:03 > + +# 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 = 39521 +# cmdline opt mapi_usock = /var/tmp/mtest-18930/.s.monetdb.39521 +# 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 + +# 20:52:03 > +# 20:52:03 > "Done." +# 20:52:03 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_none_double.stable.out b/monetdb5/modules/mal/Tests/mosaic_none_double.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_double.stable.out @@ -0,0 +1,80 @@ +stdout of test 'mosaic_none_double` in directory 'monetdb5/modules/mal` itself: + + +# 20:52:03 > +# 20:52:03 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39521" "--set" "mapi_usock=/var/tmp/mtest-18930/.s.monetdb.39521" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_none_double.mal" +# 20:52:03 > + +# 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:39521/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18930/.s.monetdb.39521 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.main():void; + b := bat.new(:oid,:int); + bat.append(b,50); + bat.append(b,19531015); + bat.append(b,9); + b := bat.append(b,b); + io.print(b); + x := mosaic.compress(b); + mosaic.dump(x); + xd := mosaic.decompress(x); + io.print(xd); + z := mosaic.compress(x); + mosaic.dump(z); + zd := mosaic.decompress(z); + io.print(zd); +end main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 50 ] +[ 1@0, 19531015 ] +[ 2@0, 9 ] +[ 3@0, 50 ] +[ 4@0, 19531015 ] +[ 5@0, 9 ] +#header block version 20140808 +#index top 1 +#[0] 6 104 +#type 5 todo 0 +#wins 7 0 0 0 0 0 0 +#elms 0 0 0 0 0 0 0 +#time 0 0 0 0 0 0 0 +#perc 0 0 0 0 0 0 0 +#none 6 +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 50 ] +[ 1@0, 19531015 ] +[ 2@0, 9 ] +[ 3@0, 50 ] +[ 4@0, 19531015 ] +[ 5@0, 9 ] +#none 6 +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 50 ] +[ 1@0, 19531015 ] +[ 2@0, 9 ] +[ 3@0, 50 ] +[ 4@0, 19531015 ] +[ 5@0, 9 ] + +# 20:52:03 > +# 20:52:03 > "Done." +# 20:52:03 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.mal b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.mal @@ -0,0 +1,24 @@ +# Compression of noncompressable column + + +b:= bat.new(:oid,:int); +bat.append(b,50); +bat.append(b,19531015); +bat.append(b,9); +b:= bat.append(b,b); + +io.print(b); +x:= mosaic.compress(b); + +c:= bat.new(:oid,:oid); +bat.append(c,0@0); +bat.append(c,2@0); +bat.append(c,5@0); +io.print(c); + +#mosaic.dump(x); +s:= algebra.leftfetchjoin(c,b); +io.print(s); +xs:= mosaic.leftfetchjoin(c,b); +io.print(xs); + diff --git a/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.err b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_none_fetchjoin` in directory 'monetdb5/modules/mal` itself: + + +# 20:46:33 > +# 20:46:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32355" "--set" "mapi_usock=/var/tmp/mtest-3204/.s.monetdb.32355" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_none_fetchjoin.mal" +# 20:46:33 > + +# 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 = 32355 +# cmdline opt mapi_usock = /var/tmp/mtest-3204/.s.monetdb.32355 +# 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 + +# 20:46:33 > +# 20:46:33 > "Done." +# 20:46:33 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.out b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.out @@ -0,0 +1,83 @@ +stdout of test 'mosaic_none_fetchjoin` in directory 'monetdb5/modules/mal` itself: + + +# 20:46:33 > +# 20:46:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32355" "--set" "mapi_usock=/var/tmp/mtest-3204/.s.monetdb.32355" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_none_fetchjoin.mal" +# 20:46:33 > + +# 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:32355/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3204/.s.monetdb.32355 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.main():void; +# Compression of noncompressable column + b := bat.new(:oid,:int); + bat.append(b,50); + bat.append(b,19531015); + bat.append(b,9); + b := bat.append(b,b); + io.print(b); + x := mosaic.compress(b); + c := bat.new(:oid,:oid); + bat.append(c,0@0); + bat.append(c,2@0); + bat.append(c,5@0); + io.print(c); +#mosaic.dump(x); + s := algebra.leftfetchjoin(c,b); + io.print(s); + xs := mosaic.leftfetchjoin(c,b); + io.print(xs); +end main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 50 ] +[ 1@0, 19531015 ] +[ 2@0, 9 ] +[ 3@0, 50 ] +[ 4@0, 19531015 ] +[ 5@0, 9 ] +#header block version 20140808 +#index top 1 +#[0] 6 104 +#type 5 todo 0 +#wins 7 0 0 0 0 0 0 +#elms 0 0 0 0 0 0 0 +#time 0 0 0 0 0 0 0 +#perc 0 0 0 0 0 0 0 +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 2@0 ] +[ 2@0, 5@0 ] +#--------------------------# +# h t # name +# void int # type _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
