Changeset: debae1ee2b04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=debae1ee2b04
Added Files:
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.sql
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.out
Modified Files:
sql/include/sql_relation.h
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
sql/test/Tests/marcin3.stable.err
Branch: default
Log Message:
merged with feb2013
diffs (186 lines):
diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -247,6 +247,8 @@ typedef enum operator_type {
(rel->processed)
#define set_processed(rel) \
rel->processed = 1
+#define reset_processed(rel) \
+ rel->processed = 0
#define is_subquery(rel) \
(rel->subquery)
#define set_subquery(rel) \
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
@@ -1388,10 +1388,6 @@ sql_exp *
rel_bind_column2( mvc *sql, sql_rel *rel, char *tname, char *cname, int f )
{
(void)f;
- /*
- if (f == sql_sel && rel && is_project(rel->op) && !is_processed(rel))
- rel = rel->l;
- */
if (!rel)
return NULL;
@@ -3647,6 +3643,8 @@ static sql_exp *
gr = groupby->l;
no_nil = 1;
+
+ reset_processed(groupby);
for ( ; args; args = args->next ) {
sql_exp *e = rel_value_exp(sql, &gr, args->data.sym, f, ek);
@@ -3654,10 +3652,13 @@ static sql_exp *
rel_project_add_exp(sql, gr, e);
e = exp_alias_or_copy(sql, exp_relname(e), exp_name(e),
gr->l, e);
}
- if (!e)
+ if (!e) {
+ set_processed(groupby);
return NULL;
+ }
list_append(exps, e);
}
+ set_processed(groupby);
groupby->l = gr;
a = sql_bind_aggr_(sql->sa, s, aname, exp_types(sql->sa, exps));
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
@@ -36,3 +36,4 @@ incorrect_subquery_delete.Bug-3315
constraint_checking.Bug_3335
pivot.Bug-3339
qualified_aggrname.Bug-3332
+cannot_use_columns_after_groupby.Bug-3340
diff --git
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.sql
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.sql
@@ -0,0 +1,11 @@
+CREATE TABLE "sys"."filer_volumes" (
+ "filer" VARCHAR(256) NOT NULL,
+ "volume" VARCHAR(256) NOT NULL,
+ "claim_tb" INTEGER,
+ "used_tb" INTEGER,
+ "used_perc" SMALLINT,
+ "function" VARCHAR(24),
+ CONSTRAINT "filer_volumes_filer_volume_pkey" PRIMARY KEY ("filer",
"volume")
+);
+ select "function", (sum(fv.claim_tb) - sum(fv.used_tb)) * 100 /
toc.total_overcapacity from sys.filer_volumes as fv, (select sum(claim_tb) -
sum(used_tb) as total_overcapacity from sys.filer_volumes) as toc group by
fv."function" order by fv."function";
+drop table filer_volumes;
diff --git
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.err
@@ -0,0 +1,38 @@
+stderr of test 'cannot_use_columns_after_groupby.Bug-3340` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:54:48 >
+# 20:54:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35773" "--set"
"mapi_usock=/var/tmp/mtest-27846/.s.monetdb.35773" "--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"
+# 20:54:48 >
+
+# 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 = 35773
+# cmdline opt mapi_usock = /var/tmp/mtest-27846/.s.monetdb.35773
+# 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
+
+# 20:54:49 >
+# 20:54:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27846" "--port=35773"
+# 20:54:49 >
+
+MAPI = (monetdb) /var/tmp/mtest-27846/.s.monetdb.35773
+QUERY = select "function", (sum(fv.claim_tb) - sum(fv.used_tb)) * 100 /
toc.total_overcapacity from sys.filer_volumes as fv, (select sum(claim_tb) -
sum(used_tb) as total_overcapacity from sys.filer_volumes) as toc group by
fv."function" order by fv."function";
+ERROR = !SELECT: no such column 'toc.total_overcapacity'
+
+# 20:54:49 >
+# 20:54:49 > "Done."
+# 20:54:49 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.out
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/cannot_use_columns_after_groupby.Bug-3340.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'cannot_use_columns_after_groupby.Bug-3340` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:54:48 >
+# 20:54:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35773" "--set"
"mapi_usock=/var/tmp/mtest-27846/.s.monetdb.35773" "--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"
+# 20:54:48 >
+
+# MonetDB 5 server v11.15.12
+# 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.775 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:35773/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27846/.s.monetdb.35773
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:54:49 >
+# 20:54:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27846" "--port=35773"
+# 20:54:49 >
+
+#CREATE TABLE "sys"."filer_volumes" (
+# "filer" VARCHAR(256) NOT NULL,
+# "volume" VARCHAR(256) NOT NULL,
+# "claim_tb" INTEGER,
+# "used_tb" INTEGER,
+# "used_perc" SMALLINT,
+# "function" VARCHAR(24),
+# CONSTRAINT "filer_volumes_filer_volume_pkey" PRIMARY KEY ("filer",
"volume")
+#);
+#drop table filer_volumes;
+
+# 20:54:49 >
+# 20:54:49 > "Done."
+# 20:54:49 >
+
diff --git a/sql/test/Tests/marcin3.stable.err
b/sql/test/Tests/marcin3.stable.err
--- a/sql/test/Tests/marcin3.stable.err
+++ b/sql/test/Tests/marcin3.stable.err
@@ -11,13 +11,13 @@ stderr of test 'marcin3` in directory 's
# 20:07:35 > Mtimeout -timeout 60 Msql -u monetdb -P monetdb --host=stem
--port=50445 < marcin3.sql
# 20:07:35 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-30365/.s.monetdb.32308
QUERY = select id, sum(val) AS valsum from nutki group by id having val>1;
-ERROR = !SELECT: cannot use non GROUP BY column 'val' in query results without
an aggregate function
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+ERROR = !SELECT: identifier 'val' unknown
+MAPI = (monetdb) /var/tmp/mtest-30365/.s.monetdb.32308
QUERY = select id, sum(val) AS valsum from nutki group by id having val>2;
-ERROR = !SELECT: cannot use non GROUP BY column 'val' in query results without
an aggregate function
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+ERROR = !SELECT: identifier 'val' unknown
+MAPI = (monetdb) /var/tmp/mtest-30365/.s.monetdb.32308
QUERY = select id, sum(val) AS valsum from nutki group by id having valsum>3;
ERROR = !SELECT: identifier 'valsum' unknown
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
