Changeset: 5534fb33a276 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5534fb33a276
Added Files:
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.sql
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.err
sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.out
Modified Files:
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2015/Tests/All
Branch: default
Log Message:
merged with jul2015
diffs (170 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -873,12 +873,10 @@ sorted_col(sql_trans *tr, sql_column *co
int sorted = 0;
/* fallback to central bat */
- if (tr && tr->parent && !col->data) {
- col = find_col(tr->parent,
- col->t->s->base.name,
- col->t->base.name,
- col->base.name);
- }
+ if (!col->t->s)
+ return 0;
+ if (tr && tr->parent && !col->data)
+ col = find_col(tr->parent, col->t->s->base.name,
col->t->base.name, col->base.name);
if (col && col->data) {
BAT *b = bind_col(tr, col, QUICK);
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -42,5 +42,6 @@ mergejoin_NULL.Bug-3747
epoch_now.Bug-3740
schema_view2.Bug-3766
create-temp-table-using-like.Bug-3767
+crash_on_declared_table.Bug-3770
quantile_function_resolution.Bug-3773
backslash_predecing_separator.Bug-3775
diff --git
a/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.sql
b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.sql
@@ -0,0 +1,27 @@
+start transaction;
+create table uniquecatalog11(id bigint PRIMARY KEY
+ , targetid bigint
+ , ra_avg double
+ , decl_avg double
+ , flux_ref double
+ , datapoints int
+ , zone smallint
+ , x double
+ , y double
+ , z double
+ , INACTIVE BOOLEAN
+);
+
+create function neighbor30()
+returns table (ra_avg double)
+begin
+ declare table uzone (id bigint, ra_avg double);
+ insert into uzone select id, ra_avg from uniquecatalog11;
+ return table( select ra_avg
+ from uzone as u0
+ where id between 10 and 20
+ and ra_avg between 10 and 20
+ );
+end;
+
+rollback;
diff --git
a/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.err
b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'crash_on_declared_table.Bug-3770` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 22:54:55 >
+# 22:54:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33786" "--set"
"mapi_usock=/var/tmp/mtest-10166/.s.monetdb.33786" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 22:54:55 >
+
+# 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 = 33786
+# cmdline opt mapi_usock = /var/tmp/mtest-10166/.s.monetdb.33786
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 22:54:56 >
+# 22:54:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10166" "--port=33786"
+# 22:54:56 >
+
+
+# 22:54:56 >
+# 22:54:56 > "Done."
+# 22:54:56 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.out
b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/crash_on_declared_table.Bug-3770.stable.out
@@ -0,0 +1,61 @@
+stdout of test 'crash_on_declared_table.Bug-3770` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 22:54:55 >
+# 22:54:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33786" "--set"
"mapi_usock=/var/tmp/mtest-10166/.s.monetdb.33786" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 22:54:55 >
+
+# MonetDB 5 server v11.21.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 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://localhost.nes.nl:33786/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10166/.s.monetdb.33786
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.32'
+# Finished reading the write-ahead log 'sql_logs/sql/log.32'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 22:54:56 >
+# 22:54:56 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10166" "--port=33786"
+# 22:54:56 >
+
+#start transaction;
+#create table uniquecatalog11(id bigint PRIMARY KEY
+# , targetid bigint
+# , ra_avg double
+# , decl_avg double
+# , flux_ref double
+# , datapoints int
+# , zone smallint
+# , x double
+# , y double
+# , z double
+# , INACTIVE BOOLEAN
+#);
+#create function neighbor30()
+#returns table (ra_avg double)
+#begin
+# declare table uzone (id bigint, ra_avg double);
+# insert into uzone select id, ra_avg from uniquecatalog11;
+# return table( select ra_avg
+# from uzone as u0
+# where id between 10 and 20
+# and ra_avg between 10 and 20
+# );
+#end;
+#rollback;
+
+# 22:54:56 >
+# 22:54:56 > "Done."
+# 22:54:56 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
