Changeset: c6eee2037814 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6eee2037814 Added Files: sql/test/Tests/50ways.sql sql/test/Tests/add_column_with_seq.sql sql/test/Tests/alter-sequence.sql sql/test/Tests/antiselect.sql sql/test/Tests/cast_str2num.sql sql/test/Tests/coalesce.sql sql/test/Tests/count.sql sql/test/Tests/crashme.sql sql/test/Tests/create_in_schema.sql sql/test/Tests/decimal.sql sql/test/Tests/decimal2.sql sql/test/Tests/default.sql sql/test/Tests/example-delete1.sql sql/test/Tests/example-delete2.sql sql/test/Tests/example-delete3.sql sql/test/Tests/example-drop.sql sql/test/Tests/example-queries.sql sql/test/Tests/example-rangeselect.sql sql/test/Tests/example-transaction.sql sql/test/Tests/example-update-view.sql sql/test/Tests/example-update1.sql sql/test/Tests/example-update2.sql sql/test/Tests/example-update3.sql sql/test/Tests/example.sql sql/test/Tests/function_syntax.sql sql/test/Tests/identifiers.sql sql/test/Tests/joins.sql sql/test/Tests/keys.sql sql/test/Tests/marcin1.sql sql/test/Tests/marcin2.sql sql/test/Tests/marcin3.sql sql/test/Tests/news.sql sql/test/Tests/null.sql sql/test/Tests/order_by_complex_exp.sql sql/test/Tests/order_by_simple_exp.sql sql/test/Tests/orderby_limit.sql sql/test/Tests/orderby_non_selection_column.sql sql/test/Tests/outerref_in_selection.sql sql/test/Tests/procedure_syntax.sql sql/test/Tests/psm.sql sql/test/Tests/rank.sql sql/test/Tests/restart-sequence.sql sql/test/Tests/round.sql sql/test/Tests/seq-default.sql sql/test/Tests/session_vars.sql sql/test/Tests/setoptimizer.sql sql/test/Tests/string.sql sql/test/Tests/table_function.sql sql/test/Tests/timezone.sql sql/test/Tests/zones.sql sql/test/Tests/zones2.sql sql/test/sys-schema/Tests/systemfunctions.sql sql/test/sys-schema/Tests/systemfunctions.stable.err sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Removed Files: sql/test/50ways.sql sql/test/Tests/50ways.sql.src sql/test/Tests/add_column_with_seq.sql.src sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128 sql/test/Tests/alter-sequence.sql.src sql/test/Tests/antiselect.sql.src sql/test/Tests/cast_str2num.sql.src sql/test/Tests/coalesce.sql.src sql/test/Tests/count.sql.src sql/test/Tests/crashme.sql.src sql/test/Tests/create_in_schema.sql.src sql/test/Tests/decimal.sql.src sql/test/Tests/decimal2.sql.src sql/test/Tests/default.sql.src sql/test/Tests/example-drop.sql.src sql/test/Tests/example-queries.sql.src sql/test/Tests/example.sql.src sql/test/Tests/function_syntax.sql.src sql/test/Tests/identifiers.sql.src sql/test/Tests/joins.sql.src sql/test/Tests/keys.sql.src sql/test/Tests/marcin1.sql.src sql/test/Tests/marcin2.sql.src sql/test/Tests/marcin3.sql.src sql/test/Tests/marcin3.stable.out.int128 sql/test/Tests/news.sql.src sql/test/Tests/null.sql.src sql/test/Tests/order_by_complex_exp.sql.src sql/test/Tests/order_by_simple_exp.sql.src sql/test/Tests/orderby_limit.sql.src sql/test/Tests/orderby_non_selection_column.sql.src sql/test/Tests/outerref_in_selection.stable.out.int128 sql/test/Tests/procedure_syntax.sql.src sql/test/Tests/psm.sql.src sql/test/Tests/rank.sql.src sql/test/Tests/restart-sequence.sql.src sql/test/Tests/round.sql.src sql/test/Tests/seq-default.sql.src sql/test/Tests/session_vars.sql.src sql/test/Tests/setoptimizer.sql.src sql/test/Tests/string.sql.src sql/test/Tests/systemfunctions.sql sql/test/Tests/systemfunctions.stable.err sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/table_function.sql.src sql/test/Tests/timezone.sql.src sql/test/Tests/trace.stable.out.int128 sql/test/Tests/zones.sql.src sql/test/Tests/zones.stable.out.int128 sql/test/add_column_with_seq.sql sql/test/alter-sequence.sql sql/test/antiselect.sql sql/test/cast_str2num.sql sql/test/coalesce.sql sql/test/count.sql sql/test/crashme.sql sql/test/create_in_schema.sql sql/test/decimal.sql sql/test/decimal2.sql sql/test/default.sql sql/test/example-delete1.sql sql/test/example-delete2.sql sql/test/example-delete3.sql sql/test/example-drop.sql sql/test/example-queries.sql sql/test/example-rangeselect.sql sql/test/example-transaction.sql sql/test/example-update-view.sql sql/test/example-update1.sql sql/test/example-update2.sql sql/test/example-update3.sql sql/test/example.sql sql/test/function_syntax.sql sql/test/identifiers.sql sql/test/joins.sql sql/test/keys.sql sql/test/marcin1.sql sql/test/marcin2.sql sql/test/marcin3.sql sql/test/news.sql sql/test/null.sql sql/test/order_by_complex_exp.sql sql/test/order_by_simple_exp.sql sql/test/orderby_limit.sql sql/test/orderby_non_selection_column.sql sql/test/outerref_in_selection.sql sql/test/procedure_syntax.sql sql/test/psm.sql sql/test/rank.sql sql/test/restart-sequence.sql sql/test/round.sql sql/test/seq-default.sql sql/test/session_vars.sql sql/test/setoptimizer.sql sql/test/string.sql sql/test/table_function.sql sql/test/timezone.sql sql/test/zones.sql sql/test/zones2.sql Modified Files: sql/test/Tests/All sql/test/Tests/big-example_s00.sql.src sql/test/Tests/big-example_s01.sql.src sql/test/Tests/big-example_s02.sql.src sql/test/Tests/big-example_s03.sql.src sql/test/Tests/big-example_s04.sql.src sql/test/Tests/big-example_s05.sql.src sql/test/Tests/big-example_s06.sql.src sql/test/Tests/big-example_s07.sql.src sql/test/Tests/big-example_s08.sql.src sql/test/Tests/big-example_s09.sql.src sql/test/Tests/big-example_s10.sql.src sql/test/Tests/big-example_s11.sql.src sql/test/Tests/big-example_s12.sql.src sql/test/Tests/big-example_s13.sql.src sql/test/Tests/big-example_s14.sql.src sql/test/Tests/big-example_s15.sql.src sql/test/Tests/big-example_s16.sql.src sql/test/Tests/big-example_s17.sql.src sql/test/Tests/big-example_s18.sql.src sql/test/Tests/big-example_s19.sql.src sql/test/Tests/big-example_s20.sql.src sql/test/Tests/big-example_s21.sql.src sql/test/Tests/big-example_s22.sql.src sql/test/Tests/big-example_s23.sql.src sql/test/Tests/marcin3.stable.err sql/test/Tests/marcin3.stable.out sql/test/Tests/trace.sql sql/test/Tests/trace.stable.err sql/test/Tests/trace.stable.out sql/test/Tests/zones.stable.out sql/test/Tests/zones2.SQL.py sql/test/sys-schema/Tests/All sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql Branch: default Log Message:
Eliminated *.int128 output files (by adding cast(... as bigint)) Eliminated *.sql.src files (by moving .sql files) except for big-example and fsum1 Moved test systemfunctions to ../sys-schema/Tests/ diffs (truncated from 1502 to 300 lines): diff --git a/sql/test/50ways.sql b/sql/test/Tests/50ways.sql rename from sql/test/50ways.sql rename to sql/test/Tests/50ways.sql diff --git a/sql/test/Tests/50ways.sql.src b/sql/test/Tests/50ways.sql.src deleted file mode 100644 --- a/sql/test/Tests/50ways.sql.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../50ways.sql diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -1,4 +1,3 @@ - # Run these first so comment-dump doesn't encounter # leftovers from other tests comment-dump @@ -8,17 +7,10 @@ comment-auth bincopycollist-prepare bincopycollist -HAVE_FITS&HAVE_GEOM&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?systemfunctions example example-queries example-drop -# -##big-example -# -#example -#example-queries #example-rangeselect -#example-drop ## #example #example-delete1 @@ -108,7 +100,7 @@ ifexists ifexists-views subqueries -#HAVE_GEOM?trace +trace HAVE_JDBCCLIENT_JAR?bogus-auto-generated-keys diff --git a/sql/test/add_column_with_seq.sql b/sql/test/Tests/add_column_with_seq.sql rename from sql/test/add_column_with_seq.sql rename to sql/test/Tests/add_column_with_seq.sql diff --git a/sql/test/Tests/add_column_with_seq.sql.src b/sql/test/Tests/add_column_with_seq.sql.src deleted file mode 100644 --- a/sql/test/Tests/add_column_with_seq.sql.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../add_column_with_seq.sql diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128 b/sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128 deleted file mode 100644 --- a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128 +++ /dev/null @@ -1,74 +0,0 @@ -stdout of test 'alastair_udf_mergetable_bug` in directory 'sql/test` itself: - - -# 14:10:49 > -# 14:10:49 > "/usr/bin/python2" "alastair_udf_mergetable_bug.py" "alastair_udf_mergetable_bug" -# 14:10:49 > - -#create table tab1 (group_by_col int, index_col int, f float); -#create table tab2 (index_col int, f float); -#insert into tab1 values (1,1,1),(1,2,2),(2,1,3),(2,2,4),(3,1,5),(3,2,6); -[ 6 ] -#insert into tab2 values (1,111),(2,222),(3,333),(4,444); -[ 4 ] -#set optimizer='default_pipe'; -#select optimizer; -% .L2 # table_name -% L2 # name -% varchar # type -% 12 # length -[ "default_pipe" ] -#select tab1.group_by_col,SUM(fuse(cast (tab1.f as INT),cast (tab2.f as INT))) from tab2 inner join tab1 on tab1.index_col = tab2.index_col group by tab1.group_by_col; -% sys.tab1, sys.L6 # table_name -% group_by_col, L5 # name -% int, bigint # type -% 1, 11 # length -[ 1, 12884902221 ] -[ 2, 30064771405 ] -[ 3, 47244640589 ] -#drop table tab1; -#drop table tab2; -# MonetDB 5 server v11.17.14 -# This is an unreleased version -# Serving database 'mTests_sql_test', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 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://riga.ins.cwi.nl:31835/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-11152/.s.monetdb.31835 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded -# 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_querylog.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: 26_sysmon.sql -# loading sql script: 39_analytics.sql -# loading sql script: 40_geom.sql -# loading sql script: 46_gsl.sql -# loading sql script: 75_storagemodel.sql -# loading sql script: 80_statistics.sql -# loading sql script: 80_udf.sql -# loading sql script: 99_system.sql - -# 14:10:50 > -# 14:10:50 > "Done." -# 14:10:50 > - diff --git a/sql/test/alter-sequence.sql b/sql/test/Tests/alter-sequence.sql rename from sql/test/alter-sequence.sql rename to sql/test/Tests/alter-sequence.sql diff --git a/sql/test/Tests/alter-sequence.sql.src b/sql/test/Tests/alter-sequence.sql.src deleted file mode 100644 --- a/sql/test/Tests/alter-sequence.sql.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../alter-sequence.sql diff --git a/sql/test/antiselect.sql b/sql/test/Tests/antiselect.sql rename from sql/test/antiselect.sql rename to sql/test/Tests/antiselect.sql diff --git a/sql/test/Tests/antiselect.sql.src b/sql/test/Tests/antiselect.sql.src deleted file mode 100644 --- a/sql/test/Tests/antiselect.sql.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../antiselect.sql diff --git a/sql/test/Tests/big-example_s00.sql.src b/sql/test/Tests/big-example_s00.sql.src --- a/sql/test/Tests/big-example_s00.sql.src +++ b/sql/test/Tests/big-example_s00.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s01.sql.src b/sql/test/Tests/big-example_s01.sql.src --- a/sql/test/Tests/big-example_s01.sql.src +++ b/sql/test/Tests/big-example_s01.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-queries.sql +$RELSRCDIR/example-queries.sql diff --git a/sql/test/Tests/big-example_s02.sql.src b/sql/test/Tests/big-example_s02.sql.src --- a/sql/test/Tests/big-example_s02.sql.src +++ b/sql/test/Tests/big-example_s02.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-rangeselect.sql +$RELSRCDIR/example-rangeselect.sql diff --git a/sql/test/Tests/big-example_s03.sql.src b/sql/test/Tests/big-example_s03.sql.src --- a/sql/test/Tests/big-example_s03.sql.src +++ b/sql/test/Tests/big-example_s03.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s04.sql.src b/sql/test/Tests/big-example_s04.sql.src --- a/sql/test/Tests/big-example_s04.sql.src +++ b/sql/test/Tests/big-example_s04.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s05.sql.src b/sql/test/Tests/big-example_s05.sql.src --- a/sql/test/Tests/big-example_s05.sql.src +++ b/sql/test/Tests/big-example_s05.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-delete1.sql +$RELSRCDIR/example-delete1.sql diff --git a/sql/test/Tests/big-example_s06.sql.src b/sql/test/Tests/big-example_s06.sql.src --- a/sql/test/Tests/big-example_s06.sql.src +++ b/sql/test/Tests/big-example_s06.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s07.sql.src b/sql/test/Tests/big-example_s07.sql.src --- a/sql/test/Tests/big-example_s07.sql.src +++ b/sql/test/Tests/big-example_s07.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s08.sql.src b/sql/test/Tests/big-example_s08.sql.src --- a/sql/test/Tests/big-example_s08.sql.src +++ b/sql/test/Tests/big-example_s08.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-delete2.sql +$RELSRCDIR/example-delete2.sql diff --git a/sql/test/Tests/big-example_s09.sql.src b/sql/test/Tests/big-example_s09.sql.src --- a/sql/test/Tests/big-example_s09.sql.src +++ b/sql/test/Tests/big-example_s09.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s10.sql.src b/sql/test/Tests/big-example_s10.sql.src --- a/sql/test/Tests/big-example_s10.sql.src +++ b/sql/test/Tests/big-example_s10.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s11.sql.src b/sql/test/Tests/big-example_s11.sql.src --- a/sql/test/Tests/big-example_s11.sql.src +++ b/sql/test/Tests/big-example_s11.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-delete3.sql +$RELSRCDIR/example-delete3.sql diff --git a/sql/test/Tests/big-example_s12.sql.src b/sql/test/Tests/big-example_s12.sql.src --- a/sql/test/Tests/big-example_s12.sql.src +++ b/sql/test/Tests/big-example_s12.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s13.sql.src b/sql/test/Tests/big-example_s13.sql.src --- a/sql/test/Tests/big-example_s13.sql.src +++ b/sql/test/Tests/big-example_s13.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s14.sql.src b/sql/test/Tests/big-example_s14.sql.src --- a/sql/test/Tests/big-example_s14.sql.src +++ b/sql/test/Tests/big-example_s14.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-update1.sql +$RELSRCDIR/example-update1.sql diff --git a/sql/test/Tests/big-example_s15.sql.src b/sql/test/Tests/big-example_s15.sql.src --- a/sql/test/Tests/big-example_s15.sql.src +++ b/sql/test/Tests/big-example_s15.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s16.sql.src b/sql/test/Tests/big-example_s16.sql.src --- a/sql/test/Tests/big-example_s16.sql.src +++ b/sql/test/Tests/big-example_s16.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s17.sql.src b/sql/test/Tests/big-example_s17.sql.src --- a/sql/test/Tests/big-example_s17.sql.src +++ b/sql/test/Tests/big-example_s17.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-update2.sql +$RELSRCDIR/example-update2.sql diff --git a/sql/test/Tests/big-example_s18.sql.src b/sql/test/Tests/big-example_s18.sql.src --- a/sql/test/Tests/big-example_s18.sql.src +++ b/sql/test/Tests/big-example_s18.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s19.sql.src b/sql/test/Tests/big-example_s19.sql.src --- a/sql/test/Tests/big-example_s19.sql.src +++ b/sql/test/Tests/big-example_s19.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example.sql +$RELSRCDIR/example.sql diff --git a/sql/test/Tests/big-example_s20.sql.src b/sql/test/Tests/big-example_s20.sql.src --- a/sql/test/Tests/big-example_s20.sql.src +++ b/sql/test/Tests/big-example_s20.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-update3.sql +$RELSRCDIR/example-update3.sql diff --git a/sql/test/Tests/big-example_s21.sql.src b/sql/test/Tests/big-example_s21.sql.src --- a/sql/test/Tests/big-example_s21.sql.src +++ b/sql/test/Tests/big-example_s21.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/Tests/big-example_s22.sql.src b/sql/test/Tests/big-example_s22.sql.src --- a/sql/test/Tests/big-example_s22.sql.src +++ b/sql/test/Tests/big-example_s22.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-transaction.sql +$RELSRCDIR/example-transaction.sql diff --git a/sql/test/Tests/big-example_s23.sql.src b/sql/test/Tests/big-example_s23.sql.src --- a/sql/test/Tests/big-example_s23.sql.src +++ b/sql/test/Tests/big-example_s23.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/../example-drop.sql +$RELSRCDIR/example-drop.sql diff --git a/sql/test/cast_str2num.sql b/sql/test/Tests/cast_str2num.sql rename from sql/test/cast_str2num.sql rename to sql/test/Tests/cast_str2num.sql diff --git a/sql/test/Tests/cast_str2num.sql.src b/sql/test/Tests/cast_str2num.sql.src deleted file mode 100644 --- a/sql/test/Tests/cast_str2num.sql.src _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
