Changeset: 5149ce7bab4a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5149ce7bab4a Modified Files: sql/test/sciql/Tests/06_slice_01.sql sql/test/sciql/Tests/06_slice_01.stable.out Branch: sciql Log Message:
extended the test for array slicing and approved the stable output diffs (228 lines): diff --git a/sql/test/sciql/Tests/06_slice_01.sql b/sql/test/sciql/Tests/06_slice_01.sql --- a/sql/test/sciql/Tests/06_slice_01.sql +++ b/sql/test/sciql/Tests/06_slice_01.sql @@ -2,10 +2,21 @@ CREATE ARRAY matrix3 (x INT DIMENSION[4] -- this update is necessary because 'v FLOAT DEFAULT <expr>' is not implemented yet. UPDATE matrix3 SET v = CASE WHEN x>y THEN x + y WHEN x<y THEN x - y ELSE 0 END; +SELECT * FROM matrix3; -SELECT v FROM matrix3[3][2]; -SELECT v FROM matrix3[*][1:3]; -SELECT v FROM matrix3[0:2:4][0:2:4]; +SELECT * FROM matrix3[3][2]; +SELECT * FROM matrix3[*][2]; +SELECT * FROM matrix3[3][*]; +SELECT * FROM matrix3[*][*]; + +SELECT * FROM matrix3[2:4][1:3]; +SELECT * FROM matrix3[2:*][1:3]; +SELECT * FROM matrix3[2:4][*:3]; + +SELECT * FROM matrix3[0:2:4][1:1:3]; +SELECT * FROM matrix3[0:2:4][*:1:3]; +SELECT * FROM matrix3[0:*:4][1:1:3]; +SELECT * FROM matrix3[0:2:4][1:1:*]; DROP ARRAY matrix3; diff --git a/sql/test/sciql/Tests/06_slice_01.stable.out b/sql/test/sciql/Tests/06_slice_01.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/sciql/Tests/06_slice_01.stable.out @@ -0,0 +1,195 @@ +stdout of test '06_slice_01` in directory 'test/sciql` itself: + + +# 14:11:57 > +# 14:11:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/export/scratch0/zhang/monet-install/sciql/debug/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=33738" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_sciql" "--set" "mal_listing=0" +# 14:11:57 > + +# MonetDB 5 server v11.8.0 +# This is an unreleased version +# Serving database 'mTests_test_sciql', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.749 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://jarl.ins.cwi.nl:33738/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 29_array.sql +# loading sql script: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 14:11:57 > +# 14:11:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=33738" +# 14:11:57 > + +#CREATE ARRAY matrix3 (x INT DIMENSION[4], y INT DIMENSION[4], v FLOAT DEFAULT 0.0); +#UPDATE matrix3 SET v = CASE WHEN x>y THEN x + y WHEN x<y THEN x - y ELSE 0 END; +[ 16 ] +#SELECT * FROM matrix3; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 0, 0 ] +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 0, 3, -3 ] +[ 1, 0, 1 ] +[ 1, 1, 0 ] +[ 1, 2, -1 ] +[ 1, 3, -2 ] +[ 2, 0, 2 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 2, 3, -1 ] +[ 3, 0, 3 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +[ 3, 3, 0 ] +#SELECT * FROM matrix3[3][2]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 3, 2, 5 ] +#SELECT * FROM matrix3[*][2]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 2, -2 ] +[ 1, 2, -1 ] +[ 2, 2, 0 ] +[ 3, 2, 5 ] +#SELECT * FROM matrix3[3][*]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 3, 0, 3 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +[ 3, 3, 0 ] +#SELECT * FROM matrix3[*][*]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 0, 0 ] +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 0, 3, -3 ] +[ 1, 0, 1 ] +[ 1, 1, 0 ] +[ 1, 2, -1 ] +[ 1, 3, -2 ] +[ 2, 0, 2 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 2, 3, -1 ] +[ 3, 0, 3 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +[ 3, 3, 0 ] +#SELECT * FROM matrix3[2:4][1:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +#SELECT * FROM matrix3[2:*][1:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +#SELECT * FROM matrix3[2:4][*:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 2, 0, 2 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 3, 0, 3 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +#SELECT * FROM matrix3[0:2:4][1:1:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +#SELECT * FROM matrix3[0:2:4][*:1:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 0, 0 ] +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 2, 0, 2 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +#SELECT * FROM matrix3[0:*:4][1:1:3]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 1, 1, 0 ] +[ 1, 2, -1 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 3, 1, 4 ] +[ 3, 2, 5 ] +#SELECT * FROM matrix3[0:2:4][1:1:*]; +% sys.matrix3, sys.matrix3, sys.matrix3 # table_name +% x, y, v # name +% int, int, double # type +% 1, 1, 24 # length +[ 0, 1, -1 ] +[ 0, 2, -2 ] +[ 0, 3, -3 ] +[ 2, 1, 3 ] +[ 2, 2, 0 ] +[ 2, 3, -1 ] +#DROP ARRAY matrix3; + +# 14:11:57 > +# 14:11:57 > "Done." +# 14:11:57 > + _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
