Changeset: a7880f7ebea3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7880f7ebea3
Modified Files:
        sql/backends/monet5/sql.c
        sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.err
        sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out
Branch: Jan2014
Log Message:

fixed bug 3414, ie crash because apply wasn't rewriten


diffs (156 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -462,6 +462,8 @@ create_table_or_view(mvc *sql, char *sna
 
                sql->sa = sa_create();
                r = rel_parse(sql, nt->query, m_deps);
+               if (r)
+                       r = rel_optimizer(sql, r);
                if (r) {
                        stmt *sqs = rel_bin(sql, r);
                        list *view_id_l = stmt_list_dependencies(sql->sa, sqs, 
VIEW_DEPENDENCY);
@@ -942,6 +944,8 @@ create_trigger(mvc *sql, char *sname, ch
                sql->sa = sa_create();
                buf = sa_strdup(sql->sa, query);
                r = rel_parse(sql, buf, m_deps);
+               if (r)
+                       r = rel_optimizer(sql, r);
                /* TODO use relational part to find dependencies */
                if (r) {
                        stmt *sqs = rel_bin(sql, r);
diff --git 
a/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.err 
b/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.err
--- a/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.err
+++ b/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.err
@@ -1,1 +1,35 @@
-Something other than a crash.
+stderr of test 'create-view-crash.Bug-3414` in directory 
'sql/test/BugTracker-2014` itself:
+
+
+# 19:54:27 >  
+# 19:54:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31123" "--set" 
"mapi_usock=/var/tmp/mtest-27196/.s.monetdb.31123" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
 "--set" "mal_listing=0"
+# 19:54:27 >  
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/rc-clean/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 = 31123
+# cmdline opt  mapi_usock = /var/tmp/mtest-27196/.s.monetdb.31123
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt  mal_listing = 0
+
+# 19:54:27 >  
+# 19:54:27 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-27196" "--port=31123"
+# 19:54:27 >  
+
+
+# 19:54:28 >  
+# 19:54:28 >  "Done."
+# 19:54:28 >  
+
diff --git 
a/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out 
b/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out
--- a/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out
+++ b/sql/test/BugTracker-2014/Tests/create-view-crash.Bug-3414.stable.out
@@ -1,1 +1,90 @@
-Something other than a crash.
+stdout of test 'create-view-crash.Bug-3414` in directory 
'sql/test/BugTracker-2014` itself:
+
+
+# 19:54:27 >  
+# 19:54:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31123" "--set" 
"mapi_usock=/var/tmp/mtest-27196/.s.monetdb.31123" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
 "--set" "mal_listing=0"
+# 19:54:27 >  
+
+# MonetDB 5 server v11.17.2
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 3.777 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://localhost.localdomain:31123/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-27196/.s.monetdb.31123
+# MonetDB/GIS module loaded
+# MonetDB/JAQL 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_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: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 19:54:27 >  
+# 19:54:27 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-27196" "--port=31123"
+# 19:54:27 >  
+
+#START TRANSACTION;
+#CREATE TABLE sys.v_models_that_satisfy_criteria_dup (
+#      set_number int,
+#      set_corr_coef real,
+#      last_crit int,
+#      crit_number int,
+#      traffic_min real,
+#      traffic_max real,
+#      crit_corr_coef real,
+#      min_lift real,
+#      min_previous_precision real,
+#      target_value varchar(1024),
+#      model_number int,
+#      number_of_scenarios bigint,
+#      previous_precision real,
+#      new_precision real,
+#      lift real,
+#      total_traffic real,
+#      corr real,
+#      corrb real,
+#      expr1 real,
+#      expr2 real,
+#      expr3 real
+#);
+#CREATE VIEW v_models_that_satisfy_criteria_min_set_dup AS
+#SELECT a.*
+#  FROM v_models_that_satisfy_criteria_dup AS a
+#  WHERE a.set_number = (
+#    SELECT MIN(b.set_number)
+#      FROM v_models_that_satisfy_criteria_dup AS b
+#      WHERE b.model_number = a.model_number
+#    );
+#ROLLBACK;
+
+# 19:54:28 >  
+# 19:54:28 >  "Done."
+# 19:54:28 >  
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to