Changeset: 1a30f74e8aa6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a30f74e8aa6 Added Files: monetdb5/modules/mal/Tests/orderidx01.stable.err monetdb5/modules/mal/Tests/orderidx01.stable.out monetdb5/modules/mal/Tests/orderidx02.stable.err monetdb5/modules/mal/Tests/orderidx02.stable.out Branch: leftmart Log Message:
Approve output diffs (truncated from 344 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/orderidx01.stable.err b/monetdb5/modules/mal/Tests/orderidx01.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/orderidx01.stable.err @@ -0,0 +1,30 @@ +stderr of test 'orderidx01` in directory 'monetdb5/modules/mal` itself: + + +# 16:08:53 > +# 16:08:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33494" "--set" "mapi_usock=/var/tmp/mtest-12996/.s.monetdb.33494" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "orderidx01.mal" +# 16:08:53 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/leftmart//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 = 33494 +# cmdline opt mapi_usock = /var/tmp/mtest-12996/.s.monetdb.33494 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal +# cmdline opt gdk_debug = 536870922 + +# 16:08:53 > +# 16:08:53 > "Done." +# 16:08:53 > + diff --git a/monetdb5/modules/mal/Tests/orderidx01.stable.out b/monetdb5/modules/mal/Tests/orderidx01.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/orderidx01.stable.out @@ -0,0 +1,139 @@ +stdout of test 'orderidx01` in directory 'monetdb5/modules/mal` itself: + + +# 16:08:53 > +# 16:08:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33494" "--set" "mapi_usock=/var/tmp/mtest-12996/.s.monetdb.33494" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "orderidx01.mal" +# 16:08:53 > + +# 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:33494/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12996/.s.monetdb.33494 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.3' +# Finished reading the write-ahead log 'sql_logs/sql/log.3' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +function user.main():void; +# create sorted oid arrangement + bv := bat.new(:oid,:int); + bat.append(bv,959217167); + bat.append(bv,1920220901); + bat.append(bv,1303856962); + bat.append(bv,1667896496); + bat.append(bv,1080090866); + bat.append(bv,527076325); + bat.append(bv,266430612); + bat.append(bv,1674978691); + bat.append(bv,1863672321); + bat.append(bv,58690783); + io.print(bv); + s0 := algebra.subselect(bv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); + io.print(s0); + s1 := algebra.subselect(bv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); + io.print(s1); + s2 := algebra.subselect(bv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); + io.print(s2); + s3 := algebra.subselect(bv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); + io.print(s3); +# introduce an oid index, it should produce the same results + bat.orderidx(bv,3); + ord := bat.getorderidx(bv); + io.print(ord); + x0 := algebra.subselect(bv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); + io.print(x0); + x1 := algebra.subselect(bv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); + io.print(x1); + x2 := algebra.subselect(bv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); + io.print(x2); + x3 := algebra.subselect(bv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); + io.print(x3); +end user.main; +#--------------------------# +# h t # name +# void int # type +#--------------------------# +[ 0@0, 959217167 ] +[ 1@0, 1920220901 ] +[ 2@0, 1303856962 ] +[ 3@0, 1667896496 ] +[ 4@0, 1080090866 ] +[ 5@0, 527076325 ] +[ 6@0, 266430612 ] +[ 7@0, 1674978691 ] +[ 8@0, 1863672321 ] +[ 9@0, 58690783 ] +#--------------------------# +# h t # name +# void void # type +#--------------------------# +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 5@0 ] +[ 2@0, 6@0 ] +[ 3@0, 9@0 ] +#--------------------------# +# h t # name +# void void # type +#--------------------------# +[ 0@0, 0@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 8@0 ] +#bat.orderidx pieces 3 +#oidx ttype 5 bat 67077 +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 9@0 ] +[ 1@0, 6@0 ] +[ 2@0, 5@0 ] +[ 3@0, 0@0 ] +[ 4@0, 4@0 ] +[ 5@0, 2@0 ] +[ 6@0, 3@0 ] +[ 7@0, 7@0 ] +[ 8@0, 8@0 ] +[ 9@0, 1@0 ] +#--------------------------# +# h t # name +# void void # type +#--------------------------# +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 0@0 ] +[ 1@0, 5@0 ] +[ 2@0, 6@0 ] +[ 3@0, 9@0 ] +#--------------------------# +# h t # name +# void void # type +#--------------------------# +[ 0@0, 0@0 ] +#--------------------------# +# h t # name +# void oid # type +#--------------------------# +[ 0@0, 1@0 ] +[ 1@0, 8@0 ] + +# 16:08:53 > +# 16:08:53 > "Done." +# 16:08:53 > + diff --git a/monetdb5/modules/mal/Tests/orderidx02.stable.err b/monetdb5/modules/mal/Tests/orderidx02.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/orderidx02.stable.err @@ -0,0 +1,30 @@ +stderr of test 'orderidx02` in directory 'monetdb5/modules/mal` itself: + + +# 16:08:53 > +# 16:08:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33494" "--set" "mapi_usock=/var/tmp/mtest-12996/.s.monetdb.33494" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "orderidx02.mal" +# 16:08:53 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/leftmart//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 = 33494 +# cmdline opt mapi_usock = /var/tmp/mtest-12996/.s.monetdb.33494 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal +# cmdline opt gdk_debug = 536870922 + +# 16:08:53 > +# 16:08:53 > "Done." +# 16:08:53 > + diff --git a/monetdb5/modules/mal/Tests/orderidx02.stable.out b/monetdb5/modules/mal/Tests/orderidx02.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/orderidx02.stable.out @@ -0,0 +1,125 @@ +stdout of test 'orderidx02` in directory 'monetdb5/modules/mal` itself: + + +# 16:08:53 > +# 16:08:53 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33494" "--set" "mapi_usock=/var/tmp/mtest-12996/.s.monetdb.33494" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/leftmart//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "orderidx02.mal" +# 16:08:53 > + +# 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:33494/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12996/.s.monetdb.33494 +# 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; +# create sorted oid arrangement + bv := bat.new(:oid,:int); + bat.append(bv,959217167); + bat.append(bv,1920220901); + bat.append(bv,1303856962); + bat.append(bv,1667896496); + bat.append(bv,1080090866); + bat.append(bv,527076325); + bat.append(bv,266430612); + bat.append(bv,1674978691); + bat.append(bv,1863672321); + bat.append(bv,58690783); + vv := algebra.slice(bv,0,10); + s0 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); + io.print(s0,vv); + s1 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); + io.print(s1,vv); + s2 := algebra.subselect(vv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); + io.print(s2,vv); + s3 := algebra.subselect(vv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); + io.print(s3,vv); +# introduce an oid index, it should produce the same results + bat.orderidx(vv,3); + ord := bat.getorderidx(vv); + io.print(ord,vv); + x0 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); + io.print(x0,vv); + x1 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); + io.print(x1,vv); + x2 := algebra.subselect(vv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); + io.print(x2,vv); + x3 := algebra.subselect(vv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); + io.print(x3,vv); +end user.main; +#--------------------------# +# h t t # name +# void void int # type +#--------------------------# +#--------------------------# +# h t t # name +# void oid int # type +#--------------------------# +[ 0@0, 0@0, 959217167 ] +[ 1@0, 5@0, 1920220901 ] +[ 2@0, 6@0, 1303856962 ] +[ 3@0, 9@0, 1667896496 ] +#--------------------------# +# h t t # name +# void void int # type +#--------------------------# +[ 0@0, 0@0, 959217167 ] +#--------------------------# +# h t t # name +# void oid int # type +#--------------------------# +[ 0@0, 1@0, 959217167 ] +[ 1@0, 8@0, 1920220901 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
