Changeset: 69d42852f110 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69d42852f110
Modified Files:
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.sql
sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.err
sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
Branch: default
Log Message:
make sure labels are unique
diffs (155 lines):
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
@@ -1499,7 +1499,6 @@
node *n,*m;
sql_rel *rel;
-
if (sql->emode == m_deps)
rel = rel_basetable(sql, t, tname);
else
@@ -1516,10 +1515,6 @@
sql_exp *e = m->data;
exp_setname(sql->sa, e, tname,
c->base.name);
-/*
- if (e->card == CARD_AGGR)
- e->card = CARD_MULTI;
-*/
}
}
return rel;
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -146,7 +146,9 @@
m->session->status = status;
strcpy(m->errstr, errstr);
} else {
+ int label = m->label;
*m = o;
+ m->label = label;
}
return rel;
}
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -1,2 +1,3 @@
correlated-update.Bug-2771
double_erange.Bug-2774
+view_avg_incorrect_result.Bug-2790
diff --git
a/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.sql
b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.sql
@@ -0,0 +1,9 @@
+create table t2790 (d double);
+insert into t2790 values (2),(3);
+select avg(d) as avg_d, avg(d*d) as avg_d2, avg(d)*avg(d) as avg2_d_mult from
t2790;
+create view tv2790 as select avg(d) as avg_d, avg(d*d) as avg_d2,
avg(d)*avg(d) as avg2_d_mult from t2790;
+
+select * from tv2790;
+
+drop view tv2790;
+drop table t2790;
diff --git
a/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.err
b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'view_avg_incorrect_result.Bug-2790` in directory
'test/BugTracker-2011` itself:
+
+
+# 16:41:00 >
+# 16:41:00 > mserver5 --debug=10 --set gdk_nr_threads=4 --set
"gdk_dbfarm=/ufs/niels/scratch/MonetDB/Linux-x86_64/var/MonetDB" --set
mapi_open=true --set mapi_port=31900 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0
; echo ; echo Over..
+# 16:41:00 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/niels/scratch/MonetDB/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 default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 4
+# cmdline opt gdk_dbfarm = /ufs/niels/scratch/MonetDB/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31900
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 16:41:01 >
+# 16:41:01 > mclient -lsql -ftest -i -e --host=alf --port=31900
+# 16:41:01 >
+
+
+# 16:41:01 >
+# 16:41:01 > Done.
+# 16:41:01 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'view_avg_incorrect_result.Bug-2790` in directory
'test/BugTracker-2011` itself:
+
+
+# 16:41:00 >
+# 16:41:00 > mserver5 --debug=10 --set gdk_nr_threads=4 --set
"gdk_dbfarm=/ufs/niels/scratch/MonetDB/Linux-x86_64/var/MonetDB" --set
mapi_open=true --set mapi_port=31900 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set mal_listing=0
; echo ; echo Over..
+# 16:41:00 >
+
+# MonetDB 5 server v11.2.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.752 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:31900/
+# MonetDB/SQL module loaded
+# MonetDB/GIS module loaded
+
+Ready.
+
+Over..
+
+# 16:41:01 >
+# 16:41:01 > mclient -lsql -ftest -i -e --host=alf --port=31900
+# 16:41:01 >
+
+#create table t2790 (d double);
+#insert into t2790 values (2),(3);
+[ 2 ]
+#select avg(d) as avg_d, avg(d*d) as avg_d2, avg(d)*avg(d) as avg2_d_mult from
t2790;
+% sys., sys., sys. # table_name
+% avg_d, avg_d2, avg2_d_mult # name
+% double, double, double # type
+% 22, 22, 22 # length
+[ 2.5, 6.5, 6.25 ]
+#create view tv2790 as select avg(d) as avg_d, avg(d*d) as avg_d2,
avg(d)*avg(d) as avg2_d_mult from t2790;
+#select * from tv2790;
+% sys.tv2790, sys.tv2790, sys.tv2790 # table_name
+% avg_d, avg_d2, avg2_d_mult # name
+% double, double, double # type
+% 22, 22, 22 # length
+[ 2.5, 6.5, 6.25 ]
+#drop view tv2790;
+#drop table t2790;
+
+# 16:41:01 >
+# 16:41:01 > Done.
+# 16:41:01 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
