Changeset: 7ad5d1d20361 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ad5d1d20361 Added Files: sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out Modified Files: testing/Mtest.py.in Branch: default Log Message:
Merge with Jul2015 branch. diffs (truncated from 327 to 300 lines): diff --git a/sql/test/BugTracker-2016/Tests/All b/sql/test/BugTracker-2016/Tests/All new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/All @@ -0,0 +1,2 @@ +LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908 +incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909 diff --git a/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql @@ -0,0 +1,11 @@ +CREATE TABLE foo (id INTEGER, bar1 INTEGER, bar2 INTEGER); +CREATE TABLE bar (barid INTEGER, value CHAR(10)); +INSERT INTO bar VALUES (1, 'aaa'); +INSERT INTO bar VALUES (2, 'bbb'); +INSERT INTO bar VALUES (3, 'ccc'); +INSERT INTO foo VALUES (100, 1, 2); +INSERT INTO foo VALUES (101, 2, 3); +SELECT B.value, F.id FROM bar B LEFT JOIN foo F ON (F.bar1 = B.barid OR F.bar2 = B.barid); + +DROP TABLE bar; +DROP TABLE foo; diff --git a/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err @@ -0,0 +1,37 @@ +stderr of test 'LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908` in directory 'sql/test/BugTracker-2016` itself: + + +# 11:40:09 > +# 11:40:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35418" "--set" "mapi_usock=/var/tmp/mtest-25261/.s.monetdb.35418" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 11:40:09 > + +# builtin opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/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 = 35418 +# cmdline opt mapi_usock = /var/tmp/mtest-25261/.s.monetdb.35418 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 11:40:09 > +# 11:40:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25261" "--port=35418" +# 11:40:09 > + + +# 11:40:09 > +# 11:40:09 > "Done." +# 11:40:09 > + diff --git a/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out @@ -0,0 +1,94 @@ +stdout of test 'LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908` in directory 'sql/test/BugTracker-2016` itself: + + +# 11:40:09 > +# 11:40:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35418" "--set" "mapi_usock=/var/tmp/mtest-25261/.s.monetdb.35418" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 11:40:09 > + +# MonetDB 5 server v11.21.14 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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://toulouse.da.cwi.nl:35418/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25261/.s.monetdb.35418 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R 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_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.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: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 11:40:09 > +# 11:40:09 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25261" "--port=35418" +# 11:40:09 > + +#CREATE TABLE foo (id INTEGER, bar1 INTEGER, bar2 INTEGER); +#CREATE TABLE bar (barid INTEGER, value CHAR(10)); +#INSERT INTO bar VALUES (1, 'aaa'); +[ 1 ] +#INSERT INTO bar VALUES (2, 'bbb'); +[ 1 ] +#INSERT INTO bar VALUES (3, 'ccc'); +[ 1 ] +#INSERT INTO foo VALUES (100, 1, 2); +[ 1 ] +#INSERT INTO foo VALUES (101, 2, 3); +[ 1 ] +#SELECT B.value, F.id FROM bar B LEFT JOIN foo F ON (F.bar1 = B.barid OR F.bar2 = B.barid); +% .b, .f # table_name +% value, id # name +% char, int # type +% 10, 1 # length +[ "aaa", 100 ] +[ "bbb", 100 ] +[ "bbb", 101 ] +[ "ccc", 101 ] +#DROP TABLE bar; +#DROP TABLE foo; + +# 11:40:09 > +# 11:40:09 > "Done." +# 11:40:09 > + diff --git a/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql @@ -0,0 +1,11 @@ +CREATE TABLE foo (id INTEGER, bar1 INTEGER, bar2 INTEGER); +CREATE TABLE bar (barid INTEGER, value CHAR(10)); +INSERT INTO bar VALUES (1, 'aaa'); +INSERT INTO bar VALUES (2, 'bbb'); +INSERT INTO bar VALUES (3, 'ccc'); +INSERT INTO foo VALUES (100, 1, 2); +INSERT INTO foo VALUES (101, 2, 3); +SELECT B.value, F.id FROM bar B LEFT JOIN foo F ON (F.bar1 = B.barid OR F.bar2 = B.id); + +DROP TABLE bar; +DROP TABLE foo; diff --git a/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err @@ -0,0 +1,40 @@ +stderr of test 'incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909` in directory 'sql/test/BugTracker-2016` itself: + + +# 12:49:55 > +# 12:49:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35896" "--set" "mapi_usock=/var/tmp/mtest-29239/.s.monetdb.35896" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 12:49:55 > + +# builtin opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/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 = 35896 +# cmdline opt mapi_usock = /var/tmp/mtest-29239/.s.monetdb.35896 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 12:49:55 > +# 12:49:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29239" "--port=35896" +# 12:49:55 > + +MAPI = (monetdb) /var/tmp/mtest-29239/.s.monetdb.35896 +QUERY = SELECT B.value, F.id FROM bar B LEFT JOIN foo F ON (F.bar1 = B.barid OR F.bar2 = B.id); +ERROR = !SELECT: no such column 'b.id' + +# 12:49:56 > +# 12:49:56 > "Done." +# 12:49:56 > + diff --git a/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out @@ -0,0 +1,85 @@ +stdout of test 'incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909` in directory 'sql/test/BugTracker-2016` itself: + + +# 12:49:55 > +# 12:49:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35896" "--set" "mapi_usock=/var/tmp/mtest-29239/.s.monetdb.35896" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 12:49:55 > + +# MonetDB 5 server v11.21.14 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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://toulouse.da.cwi.nl:35896/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-29239/.s.monetdb.35896 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R 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_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.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: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 12:49:55 > +# 12:49:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29239" "--port=35896" +# 12:49:55 > + +#CREATE TABLE foo (id INTEGER, bar1 INTEGER, bar2 INTEGER); +#CREATE TABLE bar (barid INTEGER, value CHAR(10)); +#INSERT INTO bar VALUES (1, 'aaa'); +[ 1 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
