Changeset: 0f0b1f575373 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f0b1f575373 Added Files: monetdb5/modules/mal/Tests/mosaic_frame_joins.mal monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.err monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.out monetdb5/modules/mal/Tests/mosaic_frame_subselect.mal monetdb5/modules/mal/Tests/mosaic_frame_subselect.stable.err monetdb5/modules/mal/Tests/mosaic_frame_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.stable.err monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.stable.out Modified Files: monetdb5/modules/mal/Tests/All Branch: mosaic Log Message:
Tests for frame compression diffs (truncated from 1076 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 @@ -76,8 +76,8 @@ mosaic_dictionary mosaic_zone mosaic_delta mosaic_linear +mosaic_frame mosaic_prefix -mosaic_frame mosaic_literal_double @@ -88,6 +88,7 @@ mosaic_zone_subselect mosaic_delta_subselect mosaic_linear_subselect mosaic_prefix_subselect +mosaic_frame_subselect mosaic_mix_subselect mosaic_literal_thetasubselect @@ -97,6 +98,7 @@ mosaic_zone_thetasubselect mosaic_delta_thetasubselect mosaic_linear_thetasubselect mosaic_prefix_thetasubselect +mosaic_frame_thetasubselect mosaic_mix_thetasubselect mosaic_literal_joins @@ -106,6 +108,7 @@ mosaic_zone_joins mosaic_delta_joins mosaic_linear_joins mosaic_prefix_joins +mosaic_frame_joins mosaic_mix_joins # might show different output if openssl is compiled without full sha2 diff --git a/monetdb5/modules/mal/Tests/mosaic_frame_joins.mal b/monetdb5/modules/mal/Tests/mosaic_frame_joins.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_frame_joins.mal @@ -0,0 +1,45 @@ +b:= bat.new(:oid,:timestamp); +bat.append(b,"2014-08-14 12:00:00":timestamp); +bat.append(b,"2014-08-14 12:00:00":timestamp); +bat.append(b,"2014-08-14 12:01:00":timestamp); +bat.append(b,"2014-08-14 12:02:00":timestamp); +bat.append(b,"2014-08-14 12:00:00":timestamp); +b:= bat.append(b,b); +base:= algebra.copy(b); + +io.print(base); +x:= mosaic.compress(b,"frame"); +#mosaic.dump(x); +z:= mosaic.decompress(x); +io.print(z); + +c:= bat.new(:oid,:oid); +bat.append(c,0@0); +bat.append(c,2@0); +bat.append(c,4@0); +io.print(c); + +#mosaic.dump(x); +s:= algebra.leftfetchjoin(c,base); +io.print(s); +xs:= mosaic.leftfetchjoin(c,x); +io.print(xs); + +d:= bat.new(:oid,:timestamp); +bat.append(d,"2014-08-14 12:01:00":timestamp); +bat.append(d,"2014-08-14 12:02:00":timestamp); +bat.append(d,nil:timestamp); + +(jl,jr):= algebra.join(base,d); +io.print(jl,jr); +(ml,mr):= mosaic.join(x,d); +io.print(ml,mr); + +(jl,jr):= algebra.join(d,base); +io.print(jl); +io.print(jr); +io.print(jl,jr); +(ml,mr):= mosaic.join(d,x); +io.print(ml); +io.print(mr); +io.print(ml,mr); diff --git a/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.err b/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_frame_joins` in directory 'monetdb5/modules/mal` itself: + + +# 07:18:52 > +# 07:18:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34551" "--set" "mapi_usock=/var/tmp/mtest-1480/.s.monetdb.34551" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_frame_joins.mal" +# 07:18:52 > + +# 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 = 34551 +# cmdline opt mapi_usock = /var/tmp/mtest-1480/.s.monetdb.34551 +# 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:18:52 > +# 07:18:52 > "Done." +# 07:18:52 > + diff --git a/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.out b/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.out @@ -0,0 +1,179 @@ +stdout of test 'mosaic_frame_joins` in directory 'monetdb5/modules/mal` itself: + + +# 07:18:52 > +# 07:18:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34551" "--set" "mapi_usock=/var/tmp/mtest-1480/.s.monetdb.34551" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "mosaic_frame_joins.mal" +# 07:18:52 > + +# MonetDB 5 server v11.22.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.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 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:34551/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1480/.s.monetdb.34551 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +function user.main():void; + b := bat.new(:oid,:timestamp); + bat.append(b,"2014-08-14 12:00:00.000":timestamp); + bat.append(b,"2014-08-14 12:00:00.000":timestamp); + bat.append(b,"2014-08-14 12:01:00.000":timestamp); + bat.append(b,"2014-08-14 12:02:00.000":timestamp); + bat.append(b,"2014-08-14 12:00:00.000":timestamp); + b := bat.append(b,b); + base := algebra.copy(b); + io.print(base); + x := mosaic.compress(b,"frame"); +#mosaic.dump(x); + z := mosaic.decompress(x); + io.print(z); + c := bat.new(:oid,:oid); + bat.append(c,0@0); + bat.append(c,2@0); + bat.append(c,4@0); + io.print(c); +#mosaic.dump(x); + s := algebra.leftfetchjoin(c,base); + io.print(s); + xs := mosaic.leftfetchjoin(c,x); + io.print(xs); + d := bat.new(:oid,:timestamp); + bat.append(d,"2014-08-14 12:01:00.000":timestamp); + bat.append(d,"2014-08-14 12:02:00.000":timestamp); + bat.append(d,nil:timestamp); + (jl,jr) := algebra.join(base,d); + io.print(jl,jr); + (ml,mr) := mosaic.join(x,d); + io.print(ml,mr); + (jl,jr) := algebra.join(d,base); + io.print(jl); + io.print(jr); + io.print(jl,jr); + (ml,mr) := mosaic.join(d,x); + io.print(ml); + io.print(mr); + io.print(ml,mr); +end user.main; +#--------------------------# +# h t # name +# void timestamp # type +#--------------------------# +[ 0@0, 2014-08-14 12:00:00.000 ] +[ 1@0, 2014-08-14 12:00:00.000 ] +[ 2@0, 2014-08-14 12:01:00.000 ] +[ 3@0, 2014-08-14 12:02:00.000 ] +[ 4@0, 2014-08-14 12:00:00.000 ] +[ 5@0, 2014-08-14 12:00:00.000 ] +[ 6@0, 2014-08-14 12:00:00.000 ] +[ 7@0, 2014-08-14 12:01:00.000 ] +[ 8@0, 2014-08-14 12:02:00.000 ] +[ 9@0, 2014-08-14 12:00:00.000 ] +#--------------------------# +# h t # name +# void timestamp # type +#--------------------------# +[ 0@0, 2014-08-14 12:00:00.000 ] +[ 1@0, 2014-08-14 12:00:00.000 ] +[ 2@0, 2014-08-14 12:01:00.000 ] +[ 3@0, 2014-08-14 12:02:00.000 ] +[ 4@0, 2014-08-14 12:00:00.000 ] +[ 5@0, 2014-08-14 12:00:00.000 ] +[ 6@0, 2014-08-14 12:00:00.000 ] +[ 7@0, 2014-08-14 12:01:00.000 ] +[ 8@0, 2014-08-14 12:02:00.000 ] +[ 9@0, 2014-08-14 12:00:00.000 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 2@0 ] +[ 2@0, 4@0 ] +#--------------------------# +# h t # name +# void timestamp # type +#--------------------------# +[ 0@0, 2014-08-14 12:00:00.000 ] +[ 1@0, 2014-08-14 12:01:00.000 ] +[ 2@0, 2014-08-14 12:00:00.000 ] +#--------------------------# +# h t # name +# void timestamp # type +#--------------------------# +#--------------------------# +# t t t # name +# void oid oid # type +#--------------------------# +[ 0@0, 2@0, 0@0 ] +[ 1@0, 3@0, 1@0 ] +[ 2@0, 7@0, 0@0 ] +[ 3@0, 8@0, 1@0 ] +#--------------------------# +# t t t # name +# void oid oid # type +#--------------------------# +[ 0@0, 2@0, 0@0 ] +[ 1@0, 7@0, 0@0 ] +[ 2@0, 3@0, 1@0 ] +[ 3@0, 8@0, 1@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 1@0 ] +[ 2@0, 0@0 ] +[ 3@0, 1@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 2@0 ] +[ 1@0, 3@0 ] +[ 2@0, 7@0 ] +[ 3@0, 8@0 ] +#--------------------------# +# t t t # name +# void oid oid # type +#--------------------------# +[ 0@0, 0@0, 2@0 ] +[ 1@0, 1@0, 3@0 ] +[ 2@0, 0@0, 7@0 ] +[ 3@0, 1@0, 8@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 0@0 ] +[ 2@0, 1@0 ] +[ 3@0, 1@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 2@0 ] +[ 1@0, 7@0 ] +[ 2@0, 3@0 ] +[ 3@0, 8@0 ] +#--------------------------# +# t t t # name +# void oid oid # type +#--------------------------# +[ 0@0, 0@0, 2@0 ] +[ 1@0, 0@0, 7@0 ] +[ 2@0, 1@0, 3@0 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
