Changeset: db621e4ab93d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db621e4ab93d
Added Files:
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.err
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
Modified Files:
sql/server/rel_exp.c
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:
Merge with Apr2012 branch.
diffs (146 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1144,7 +1144,7 @@ int
exps_card( list *l )
{
node *n;
- int card = 0;
+ int card = CARD_ATOM;
if (l) for(n = l->h; n; n = n->next) {
sql_exp *e = n->data;
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -609,7 +609,7 @@ rel_project(sql_allocator *sa, sql_rel *
rel->r = NULL;
rel->op = op_project;
rel->exps = e;
- rel->card = CARD_MULTI;
+ rel->card = exps_card(e);
if (l) {
rel->card = l->card;
rel->nrcols = l->nrcols;
@@ -760,6 +760,8 @@ rel_project_add_exp( mvc *sql, sql_rel *
if (!rel->exps)
rel->exps = new_exp_list(sql->sa);
append(rel->exps, e);
+ if (e->card > rel->card)
+ rel->card = e->card;
} else if (rel->op == op_groupby) {
(void) rel_groupby_add_aggr(sql, rel, e);
}
@@ -4235,7 +4237,7 @@ rel_order_by(mvc *sql, sql_rel **R, symb
if (!e)
return NULL;
e = exp_column(sql->sa,
e->rname, e->r, exp_subtype(e), rel->card, has_nil(e), is_intern(e));
- } else {
+ } else if (e->type == e_atom) {
return sql_error(sql, 02,
"order not of type SQL_COLUMN\n");
}
}
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -39,3 +39,4 @@ grant_on_qname.Bug-2958
bug_large-insert-Bug.2960
any_null.Bug-2594
float-mod.Bug-3086
+aggregate_vs_positional_column_crash.Bug-3085
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
@@ -0,0 +1,2 @@
+SELECT 1, (SELECT count(*) FROM tables);
+SELECT (SELECT count(*) FROM tables), 1;
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.err
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'aggregate_vs_positional_column_crash.Bug-3085` in directory
'test/BugTracker-2012` itself:
+
+
+# 21:48:51 >
+# 21:48:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=39026" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 21:48:51 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39026
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 21:48:51 >
+# 21:48:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=39026"
+# 21:48:51 >
+
+
+# 21:48:51 >
+# 21:48:51 > "Done."
+# 21:48:51 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'aggregate_vs_positional_column_crash.Bug-3085` in directory
'test/BugTracker-2012` itself:
+
+
+# 21:48:51 >
+# 21:48:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=39026" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 21:48:51 >
+
+# MonetDB 5 server v11.9.2
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:39026/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 21:48:51 >
+# 21:48:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=39026"
+# 21:48:51 >
+
+#SELECT 1, (SELECT count(*) FROM tables);
+% .L2, .tables # table_name
+% L2, L1 # name
+% tinyint, wrd # type
+% 1, 2 # length
+[ 1, 31 ]
+#SELECT (SELECT count(*) FROM tables), 1;
+% .tables, . # table_name
+% L1, single_value # name
+% wrd, tinyint # type
+% 2, 1 # length
+[ 31, 1 ]
+
+# 21:48:51 >
+# 21:48:51 > "Done."
+# 21:48:51 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
