Changeset: 1cebff7ea880 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1cebff7ea880 Added Files: monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.err monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.out Modified Files: monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out monetdb5/modules/mal/mosaic.c monetdb5/modules/mal/mosaic.mal monetdb5/modules/mal/mosaic_delta.c monetdb5/modules/mal/mosaic_dict.c monetdb5/modules/mal/mosaic_hdr.c monetdb5/modules/mal/mosaic_linear.c monetdb5/modules/mal/mosaic_rle.c monetdb5/optimizer/opt_mosaic.c Branch: mosaic Log Message:
Gather mosaic statistics on complete databases diffs (truncated from 950 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out @@ -112,6 +112,8 @@ end main; # h t t # name # void void void # type #--------------------------# +[ 0@0, 2@0, 0@0 ] +[ 1@0, 3@0, 1@0 ] #--------------------------# # h t t # name # void oid oid # type @@ -122,6 +124,8 @@ end main; # h t t # name # void void void # type #--------------------------# +[ 0@0, 0@0, 2@0 ] +[ 1@0, 1@0, 3@0 ] # 19:38:40 > # 19:38:40 > "Done." diff --git a/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.err b/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_linear_subselect` in directory 'monetdb5/modules/mal` itself: + + +# 11:03:45 > +# 11:03:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39740" "--set" "mapi_usock=/var/tmp/mtest-12899/.s.monetdb.39740" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_linear_subselect.mal" +# 11:03:45 > + +# 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 = 39740 +# cmdline opt mapi_usock = /var/tmp/mtest-12899/.s.monetdb.39740 +# 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 + +# 11:03:46 > +# 11:03:46 > "Done." +# 11:03:46 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.out @@ -0,0 +1,246 @@ +stdout of test 'mosaic_linear_subselect` in directory 'monetdb5/modules/mal` itself: + + +# 11:03:45 > +# 11:03:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39740" "--set" "mapi_usock=/var/tmp/mtest-12899/.s.monetdb.39740" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_linear_subselect.mal" +# 11:03:45 > + +# 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:39740/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12899/.s.monetdb.39740 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +function user.main():void; +# Linear range compressions + b := bat.new(:oid,:int); + bat.append(b,0); + bat.append(b,2); + bat.append(b,4); + bat.append(b,6); + bat.append(b,8); + bat.append(b,10); + bat.append(b,1); + bat.append(b,4); + bat.append(b,7); + bat.append(b,10); + bat.append(b,13); + bat.append(b,16); + io.print(b); + x := mosaic.compress(b,"linear"); +#mosaic.dump(x); + z := mosaic.decompress(x); + io.print(z); + s := algebra.subselect(b,0,4,false,false,false); + io.print(s); + xs := mosaic.subselect(x,0,4,false,false,false); + io.print(xs); + s := algebra.subselect(b,0,4,false,true,false); + io.print(s); + xs := mosaic.subselect(x,0,4,false,true,false); + io.print(xs); + s := algebra.subselect(b,0,4,true,false,false); + io.print(s); + xs := mosaic.subselect(x,0,4,true,false,false); + io.print(xs); + s := algebra.subselect(b,0,4,true,true,false); + io.print(s); + xs := mosaic.subselect(x,0,4,true,true,false); + io.print(xs); + s := algebra.subselect(b,nil:int,4,false,false,false); + io.print(s); + xs := mosaic.subselect(x,nil:int,4,false,false,false); + io.print(xs); + s := algebra.subselect(b,4,nil:int,false,false,false); + io.print(s); + xs := mosaic.subselect(x,4,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); +end main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 0 ] +[ 1@0, 2 ] +[ 2@0, 4 ] +[ 3@0, 6 ] +[ 4@0, 8 ] +[ 5@0, 10 ] +[ 6@0, 1 ] +[ 7@0, 4 ] +[ 8@0, 7 ] +[ 9@0, 10 ] +[ 10@0, 13 ] +[ 11@0, 16 ] +# none 1 12 0 rle 0 0 0 dict 0 0 0 delta 0 0 0 linear 0 0 0 zone 0 0 0 +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 0 ] +[ 1@0, 2 ] +[ 2@0, 4 ] +[ 3@0, 6 ] +[ 4@0, 8 ] +[ 5@0, 10 ] +[ 6@0, 1 ] +[ 7@0, 4 ] +[ 8@0, 7 ] +[ 9@0, 10 ] +[ 10@0, 13 ] +[ 11@0, 16 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 2@0 ] +[ 2@0, 6@0 ] +[ 3@0, 7@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 2@0 ] +[ 2@0, 6@0 ] +[ 3@0, 7@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 2@0 ] +[ 3@0, 6@0 ] +[ 4@0, 7@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 2@0 ] +[ 3@0, 6@0 ] +[ 4@0, 7@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 6@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 3@0 ] +[ 1@0, 4@0 ] +[ 2@0, 5@0 ] +[ 3@0, 8@0 ] +[ 4@0, 9@0 ] +[ 5@0, 10@0 ] +[ 6@0, 11@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 3@0 ] +[ 1@0, 4@0 ] +[ 2@0, 5@0 ] +[ 3@0, 8@0 ] +[ 4@0, 9@0 ] +[ 5@0, 10@0 ] +[ 6@0, 11@0 ] +#--------------------------# +# t h # name +# void void # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 2@0 ] +[ 3@0, 3@0 ] +[ 4@0, 4@0 ] +[ 5@0, 5@0 ] +[ 6@0, 6@0 ] +[ 7@0, 7@0 ] +[ 8@0, 8@0 ] +[ 9@0, 9@0 ] +[ 10@0, 10@0 ] +[ 11@0, 11@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 2@0 ] +[ 3@0, 3@0 ] +[ 4@0, 4@0 ] +[ 5@0, 5@0 ] +[ 6@0, 6@0 ] +[ 7@0, 7@0 ] +[ 8@0, 8@0 ] +[ 9@0, 9@0 ] +[ 10@0, 10@0 ] +[ 11@0, 11@0 ] +#--------------------------# +# h t # name +# void void # type +#--------------------------# +#--------------------------# +# h t # name _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
