Changeset: 2aecd2f172c5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2aecd2f172c5 Modified Files: monetdb5/modules/mal/array.mx sql/test/sciql/Tests/00_syntax_error_01.stable.out sql/test/sciql/Tests/00_syntax_error_02.stable.out sql/test/sciql/Tests/00_syntax_error_03.stable.out sql/test/sciql/Tests/00_syntax_error_04.stable.out sql/test/sciql/Tests/00_syntax_error_05.stable.out sql/test/sciql/Tests/01_create_02.stable.out sql/test/sciql/Tests/01_create_03.stable.out sql/test/sciql/Tests/01_create_04.stable.out sql/test/sciql/Tests/01_create_05.stable.out sql/test/sciql/Tests/01_create_06.stable.out sql/test/sciql/Tests/01_create_07.stable.out sql/test/sciql/Tests/01_create_08.stable.out sql/test/sciql/Tests/01_create_09.stable.out sql/test/sciql/Tests/01_create_10.stable.out sql/test/sciql/Tests/01_create_11.stable.out sql/test/sciql/Tests/01_create_12.stable.out sql/test/sciql/Tests/01_create_20.stable.out Branch: sciql Log Message:
approve stable out due to changes in Mtest output and length of double in serialisation diffs (truncated from 425 to 300 lines): diff --git a/monetdb5/modules/mal/array.mx b/monetdb5/modules/mal/array.mx --- a/monetdb5/modules/mal/array.mx +++ b/monetdb5/modules/mal/array.mx @@ -84,7 +84,7 @@ pattern map(dims:bat[:oid,:any]...):bat[ address ARRAYmap comment "The argument is a double set of dimension columns. The first set describes the shape of the target array and the second one holds the index values of interest. The result is a column -with the oid positions of the elements in target. "; +with the oid positions of the elements in target."; pattern unmap(cells:bat[:oid,:oid], dims:bat[:oid,:any]...):bat[:oid,:any]... address ARRAYumap diff --git a/sql/test/sciql/Tests/00_syntax_error_01.stable.out b/sql/test/sciql/Tests/00_syntax_error_01.stable.out --- a/sql/test/sciql/Tests/00_syntax_error_01.stable.out +++ b/sql/test/sciql/Tests/00_syntax_error_01.stable.out @@ -19,15 +19,33 @@ stdout of test '00_syntax_error_01` in d 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: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql -Over.. +# 16:28:17 > +# 16:28:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31491" +# 16:28:17 > -# 13:37:16 > -# 13:37:16 > mclient -lsql -ftest -i -e --host=jarl --port=38847 -# 13:37:16 > +# 16:28:17 > +# 16:28:17 > "Done." +# 16:28:17 > -# 13:37:16 > -# 13:37:16 > Done. -# 13:37:16 > - diff --git a/sql/test/sciql/Tests/00_syntax_error_02.stable.out b/sql/test/sciql/Tests/00_syntax_error_02.stable.out --- a/sql/test/sciql/Tests/00_syntax_error_02.stable.out +++ b/sql/test/sciql/Tests/00_syntax_error_02.stable.out @@ -20,7 +20,9 @@ stdout of test '00_syntax_error_02` in d Ready. # SQL catalog created, loading sql scripts once -Over.. +# 16:32:39 > +# 16:32:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:39 > # 13:37:40 > # 13:37:40 > mclient -lsql -ftest -i -e --host=jarl --port=38663 diff --git a/sql/test/sciql/Tests/00_syntax_error_03.stable.out b/sql/test/sciql/Tests/00_syntax_error_03.stable.out --- a/sql/test/sciql/Tests/00_syntax_error_03.stable.out +++ b/sql/test/sciql/Tests/00_syntax_error_03.stable.out @@ -20,7 +20,9 @@ stdout of test '00_syntax_error_03` in d Ready. # SQL catalog created, loading sql scripts once -Over.. +# 16:32:39 > +# 16:32:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:39 > # 13:45:43 > # 13:45:43 > mclient -lsql -ftest -i -e --host=jarl --port=30420 diff --git a/sql/test/sciql/Tests/00_syntax_error_04.stable.out b/sql/test/sciql/Tests/00_syntax_error_04.stable.out --- a/sql/test/sciql/Tests/00_syntax_error_04.stable.out +++ b/sql/test/sciql/Tests/00_syntax_error_04.stable.out @@ -20,7 +20,9 @@ stdout of test '00_syntax_error_04` in d Ready. # SQL catalog created, loading sql scripts once -Over.. +# 16:32:39 > +# 16:32:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:39 > # 13:47:35 > # 13:47:35 > mclient -lsql -ftest -i -e --host=jarl --port=32630 diff --git a/sql/test/sciql/Tests/00_syntax_error_05.stable.out b/sql/test/sciql/Tests/00_syntax_error_05.stable.out --- a/sql/test/sciql/Tests/00_syntax_error_05.stable.out +++ b/sql/test/sciql/Tests/00_syntax_error_05.stable.out @@ -20,7 +20,9 @@ stdout of test '00_syntax_error_05` in d Ready. # SQL catalog created, loading sql scripts once -Over.. +# 16:32:39 > +# 16:32:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:39 > # 13:48:15 > # 13:48:15 > mclient -lsql -ftest -i -e --host=jarl --port=38366 diff --git a/sql/test/sciql/Tests/01_create_02.stable.out b/sql/test/sciql/Tests/01_create_02.stable.out --- a/sql/test/sciql/Tests/01_create_02.stable.out +++ b/sql/test/sciql/Tests/01_create_02.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_02` in directo Ready. -Over.. - -# 23:27:05 > -# 23:27:05 > mclient -lsql -ftest -i -e --host=jarl --port=30166 -# 23:27:05 > +# 16:32:40 > +# 16:32:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:40 > #CREATE ARRAY ary (x INTEGER DIMENSION, v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:27:05 > diff --git a/sql/test/sciql/Tests/01_create_03.stable.out b/sql/test/sciql/Tests/01_create_03.stable.out --- a/sql/test/sciql/Tests/01_create_03.stable.out +++ b/sql/test/sciql/Tests/01_create_03.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_03` in directo Ready. -Over.. - -# 23:29:47 > -# 23:29:47 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:47 > +# 16:32:40 > +# 16:32:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:40 > #CREATE ARRAY ary (x INTEGER DIMENSION[*], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:47 > diff --git a/sql/test/sciql/Tests/01_create_04.stable.out b/sql/test/sciql/Tests/01_create_04.stable.out --- a/sql/test/sciql/Tests/01_create_04.stable.out +++ b/sql/test/sciql/Tests/01_create_04.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_04` in directo Ready. -Over.. - -# 23:29:47 > -# 23:29:47 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:47 > +# 16:32:40 > +# 16:32:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:40 > #CREATE ARRAY ary (x INTEGER DIMENSION[3:13], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:47 > diff --git a/sql/test/sciql/Tests/01_create_05.stable.out b/sql/test/sciql/Tests/01_create_05.stable.out --- a/sql/test/sciql/Tests/01_create_05.stable.out +++ b/sql/test/sciql/Tests/01_create_05.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_05` in directo Ready. -Over.. - -# 23:29:47 > -# 23:29:47 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:47 > +# 16:32:40 > +# 16:32:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:40 > #CREATE ARRAY ary (x INTEGER DIMENSION[*:13], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:47 > diff --git a/sql/test/sciql/Tests/01_create_06.stable.out b/sql/test/sciql/Tests/01_create_06.stable.out --- a/sql/test/sciql/Tests/01_create_06.stable.out +++ b/sql/test/sciql/Tests/01_create_06.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_06` in directo Ready. -Over.. - -# 23:29:48 > -# 23:29:48 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:48 > +# 16:32:41 > +# 16:32:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:41 > #CREATE ARRAY ary (x INTEGER DIMENSION[3:*], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:48 > diff --git a/sql/test/sciql/Tests/01_create_07.stable.out b/sql/test/sciql/Tests/01_create_07.stable.out --- a/sql/test/sciql/Tests/01_create_07.stable.out +++ b/sql/test/sciql/Tests/01_create_07.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_07` in directo Ready. -Over.. - -# 23:29:48 > -# 23:29:48 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:48 > +# 16:32:41 > +# 16:32:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:41 > #CREATE ARRAY ary (x INTEGER DIMENSION[*:3:13], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:48 > diff --git a/sql/test/sciql/Tests/01_create_08.stable.out b/sql/test/sciql/Tests/01_create_08.stable.out --- a/sql/test/sciql/Tests/01_create_08.stable.out +++ b/sql/test/sciql/Tests/01_create_08.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_08` in directo Ready. -Over.. - -# 23:29:48 > -# 23:29:48 > mclient -lsql -ftest -i -e --host=jarl --port=31678 -# 23:29:48 > +# 16:32:41 > +# 16:32:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=jarl" "--port=31347" +# 16:32:41 > #CREATE ARRAY ary (x INTEGER DIMENSION[3:*:13], v FLOAT DEFAULT 3.7); #SELECT * FROM ary; % sys.ary, sys.ary # table_name % x, v # name % int, double # type -% 1, 22 # length +% 1, 24 # length #DROP ARRAY ary; # 23:29:48 > diff --git a/sql/test/sciql/Tests/01_create_09.stable.out b/sql/test/sciql/Tests/01_create_09.stable.out --- a/sql/test/sciql/Tests/01_create_09.stable.out +++ b/sql/test/sciql/Tests/01_create_09.stable.out @@ -19,18 +19,16 @@ stdout of test '01_create_09` in directo _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
