Changeset: 0a940b3f3f28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a940b3f3f28
Added Files:
sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql
sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err
sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2016/Tests/All
Branch: Jun2016
Log Message:
fixed crash in bug 6081
diffs (126 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -2088,7 +2088,7 @@ exps_unique( list *exps )
if (e && (p = find_prop(e->p, PROP_HASHCOL)) != NULL) {
sql_ukey *k = p->value;
- if (list_length(k->k.columns) <= 1)
+ if (k && list_length(k->k.columns) <= 1)
return 1;
}
}
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -53,3 +53,4 @@ ifthenelse-void.Bug-6075
assert-on-table-producing-function.Bug-6076
assert-on-push-project-up.Bug-6077
assert-on-project.Bug-6078
+crash.Bug-6081
diff --git a/sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql
b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql
@@ -0,0 +1,10 @@
+select distinct
+ ref_1.dependency_type_name as c0,
+ ref_1.dependency_type_id as c1,
+ ref_1.dependency_type_name as c2,
+ ref_1.dependency_type_name as c3,
+ ref_1.dependency_type_id as c4
+from
+ sys.dependency_types as ref_1
+where ref_1.dependency_type_name is NULL
+limit 96;
diff --git a/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err
b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'crash.Bug-6081` in directory 'sql/test/BugTracker-2016` itself:
+
+
+# 10:17:31 >
+# 10:17:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36589" "--set"
"mapi_usock=/var/tmp/mtest-6720/.s.monetdb.36589" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 10:17:31 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/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 = 36589
+# cmdline opt mapi_usock = /var/tmp/mtest-6720/.s.monetdb.36589
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:17:32 >
+# 10:17:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6720" "--port=36589"
+# 10:17:32 >
+
+
+# 10:17:32 >
+# 10:17:32 > "Done."
+# 10:17:32 >
+
diff --git a/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out
b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'crash.Bug-6081` in directory 'sql/test/BugTracker-2016` itself:
+
+
+# 10:17:31 >
+# 10:17:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36589" "--set"
"mapi_usock=/var/tmp/mtest-6720/.s.monetdb.36589" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 10:17:31 >
+
+# MonetDB 5 server v11.23.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:36589/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-6720/.s.monetdb.36589
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:17:32 >
+# 10:17:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6720" "--port=36589"
+# 10:17:32 >
+
+#select distinct
+# ref_1.dependency_type_name as c0,
+# ref_1.dependency_type_id as c1,
+# ref_1.dependency_type_name as c2,
+# ref_1.dependency_type_name as c3,
+# ref_1.dependency_type_id as c4
+#from
+# sys.dependency_types as ref_1
+#where ref_1.dependency_type_name is NULL
+#limit 96;
+% sys.L1, sys.L2, sys.L3, sys.L4, sys.L5 # table_name
+% c0, c1, c2, c3, c4 # name
+% varchar, smallint, varchar, varchar, smallint # type
+% 0, 1, 0, 0, 1 # length
+
+# 10:17:32 >
+# 10:17:32 > "Done."
+# 10:17:32 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
