Changeset: 7a34ddda4f41 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a34ddda4f41
Added Files:
sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.sql
sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.err
sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.out
Modified Files:
monetdb5/mal/mal_dataflow.c
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (145 lines):
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -198,8 +198,8 @@ q_dequeue(queue *q)
MT_sema_down(&q->s, "q_dequeue");
if (exiting)
return NULL;
+ MT_lock_set(&q->l, "q_dequeue");
assert(q->last);
- MT_lock_set(&q->l, "q_dequeue");
if (q->last > 0) {
/* LIFO favors garbage collection */
r = q->data[--q->last];
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
@@ -174,7 +174,7 @@ exp_alias_or_copy( mvc *sql, char *tname
tname = old->l;
if (!cname && exp_name(old) && exp_name(old)[0] == 'L') {
- ne = exp_column(sql->sa, exp_relname(old), exp_name(old),
exp_subtype(old), orel->card, has_nil(old), is_intern(old));
+ ne = exp_column(sql->sa, exp_relname(old), exp_name(old),
exp_subtype(old), orel?orel->card:CARD_ATOM, has_nil(old), is_intern(old));
ne->p = prop_copy(sql->sa, old->p);
return ne;
} else if (!cname) {
@@ -182,13 +182,13 @@ exp_alias_or_copy( mvc *sql, char *tname
nme = number2name(name, 16, ++sql->label);
exp_setname(sql->sa, old, nme, nme);
- ne = exp_column(sql->sa, nme, nme, exp_subtype(old),
orel->card, has_nil(old), is_intern(old));
+ ne = exp_column(sql->sa, nme, nme, exp_subtype(old),
orel?orel->card:CARD_ATOM, has_nil(old), is_intern(old));
ne->p = prop_copy(sql->sa, old->p);
return ne;
} else if (cname && !old->name) {
exp_setname(sql->sa, old, tname, cname);
}
- ne = exp_column(sql->sa, tname, cname, exp_subtype(old), orel->card,
has_nil(old), is_intern(old));
+ ne = exp_column(sql->sa, tname, cname, exp_subtype(old),
orel?orel->card:CARD_ATOM, has_nil(old), is_intern(old));
ne->p = prop_copy(sql->sa, old->p);
return ne;
}
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -9,3 +9,4 @@ stddev-group.Bug-3257
oid_handling
between.Bug-3259
correlated_select.Bug-3250
+groupby_on_value_view.Bug-3264
diff --git a/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.sql
b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.sql
@@ -0,0 +1,5 @@
+start transaction;
+CREATE VIEW mmtest_v AS SELECT date'2012-01-01' as period, 1 as quantity;
+SELECT extract(month from period) as m, count(1) as cnt FROM mmtest_v GROUP BY
m;
+rollback;
+
diff --git
a/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.err
b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'groupby_on_value_view.Bug-3264` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 12:47:25 >
+# 12:47:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39993" "--set"
"mapi_usock=/var/tmp/mtest-23677/.s.monetdb.39993" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 12:47:25 >
+
+# 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 = 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 mapi_open = true
+# cmdline opt mapi_port = 39993
+# cmdline opt mapi_usock = /var/tmp/mtest-23677/.s.monetdb.39993
+# 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-2013
+# cmdline opt mal_listing = 0
+
+# 12:47:26 >
+# 12:47:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23677" "--port=39993"
+# 12:47:26 >
+
+
+# 12:47:26 >
+# 12:47:26 > "Done."
+# 12:47:26 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.out
b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/groupby_on_value_view.Bug-3264.stable.out
@@ -0,0 +1,41 @@
+stdout of test 'groupby_on_value_view.Bug-3264` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 12:47:25 >
+# 12:47:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39993" "--set"
"mapi_usock=/var/tmp/mtest-23677/.s.monetdb.39993" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 12:47:25 >
+
+# MonetDB 5 server v11.15.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', 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-2013 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:39993/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23677/.s.monetdb.39993
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:47:26 >
+# 12:47:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23677" "--port=39993"
+# 12:47:26 >
+
+#start transaction;
+#CREATE VIEW mmtest_v AS SELECT date'2012-01-01' as period, 1 as quantity;
+#SELECT extract(month from period) as m, count(1) as cnt FROM mmtest_v GROUP
BY m;
+% ., .L1 # table_name
+% m, cnt # name
+% int, wrd # type
+% 1, 1 # length
+[ 1, 1 ]
+#rollback;
+
+# 12:47:26 >
+# 12:47:26 > "Done."
+# 12:47:26 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
