Changeset: ce980adad65b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce980adad65b
Added Files:
sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql
sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err
sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out
sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql
sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.err
sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.out
sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.sql
sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.err
sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.out
Modified Files:
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_select.c
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.sql
Branch: Jun2016
Log Message:
fixed bugs 6078, 6077 and 6076
All related to naming a table producing function.
diffs (truncated from 594 to 300 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
@@ -624,14 +624,19 @@ exp_setrelname(sql_allocator *sa, sql_ex
e->rname = sa_strdup(sa, nme);
}
-sql_exp*
-exp_label(sql_allocator *sa, sql_exp *e, int nr)
+char *
+make_label(sql_allocator *sa, int nr)
{
char name[16], *nme;
nme = number2name(name, 16, nr);
- e->name = sa_strdup(sa, nme);
- e->rname = sa_strdup(sa, nme);
+ return sa_strdup(sa, nme);
+}
+
+sql_exp*
+exp_label(sql_allocator *sa, sql_exp *e, int nr)
+{
+ e->rname = e->name = make_label(sa, nr);
return e;
}
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -85,6 +85,7 @@ extern void exp_setname(sql_allocator *s
extern void exp_setrelname(sql_allocator *sa, sql_exp *e, int nr );
extern void noninternexp_setname(sql_allocator *sa, sql_exp *e, const char
*rname, const char *name );
+extern char* make_label(sql_allocator *sa, int nr);
extern sql_exp* exp_label(sql_allocator *sa, sql_exp *e, int nr);
extern sql_exp * exp_copy( sql_allocator *sa, sql_exp *e);
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
@@ -575,6 +575,8 @@ rel_named_table_function(mvc *sql, sql_r
if (query->data.lval->h->next->data.sym)
tname =
query->data.lval->h->next->data.sym->data.lval->h->data.sval;
+ else
+ tname = make_label(sql->sa, ++sql->label);
/* column or table function */
sf = e->f;
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -50,3 +50,6 @@ name_conflict_in_union.Bug-6065
cast_and_floor.Bug-6071
union.Bug-6069
ifthenelse-void.Bug-6075
+assert-on-table-producing-function.Bug-6076
+assert-on-push-project-up.Bug-6077
+assert-on-project.Bug-6078
diff --git a/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql
b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql
@@ -0,0 +1,27 @@
+
+select
+ ref_116.id as c0,
+ 35 as c1,
+ ref_164.sorting_order as c2,
+ ref_1.name as c3,
+ ref_165.table_id as c4,
+ ref_152.function_id as c5,
+ 77 as c6,
+ ref_1.value as c7,
+ ref_165.type as c8
+ from
+ sys.environment as ref_1
+ inner join sys.columns as ref_116
+ inner join sys.systemfunctions as ref_152
+ inner join bam.files as ref_164
+ right join sys.keys as ref_165
+ on
(ref_164.sorting_order = ref_165.name )
+ left
join sys.statistics as ref_168
+
on (ref_165.table_id = ref_168.column_id )
+
on (ref_152.function_id = ref_165.id )
+
on (ref_116.storage = ref_165.name )
+
on (ref_1.value = ref_164.file_location )
+
where (cast(coalesce(83,
+
ref_168.width) as int) is not NULL)
+
and (ref_165.action is not NULL)
+
limit 62;
diff --git
a/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err
b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'assert-on-project.Bug-6078` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 14:17:21 >
+# 14:17:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39688" "--set"
"mapi_usock=/var/tmp/mtest-23333/.s.monetdb.39688" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 14:17:21 >
+
+# 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 = 39688
+# cmdline opt mapi_usock = /var/tmp/mtest-23333/.s.monetdb.39688
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 14:17:21 >
+# 14:17:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23333" "--port=39688"
+# 14:17:21 >
+
+
+# 14:17:21 >
+# 14:17:21 > "Done."
+# 14:17:21 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out
b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out
@@ -0,0 +1,53 @@
+stdout of test 'assert-on-project.Bug-6078` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 14:17:21 >
+# 14:17:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39688" "--set"
"mapi_usock=/var/tmp/mtest-23333/.s.monetdb.39688" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 14:17:21 >
+
+# MonetDB 5 server v11.23.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:39688/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23333/.s.monetdb.39688
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 14:17:21 >
+# 14:17:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23333" "--port=39688"
+# 14:17:21 >
+
+#select
+# ref_116.id as c0,
+# 35 as c1,
+# ref_164.sorting_order as c2,
+# ref_1.name as c3,
+# ref_165.table_id as c4,
+# ref_152.function_id as c5,
+# 77 as c6,
+# ref_1.value as c7,
+# ref_165.type as c8
+# from
+# sys.environment as ref_1
+# inner join sys.columns as ref_116
+# inner join sys.systemfunctions as ref_152
+# inner join bam.files as ref_164
+# right join sys.keys as ref_165
+# on
(ref_164.sorting_order = ref_165.name )
+% .L3, .L4, .L5, .L6, .L7, .L10, .L11, .L12, .L13 #
table_name
+% c0, c1, c2, c3, c4, c5, c6, c7, c8 # name
+% int, tinyint, varchar, clob, int, int, tinyint,
clob, int # type
+% 1, 1, 0, 0, 1, 1, 1, 0, 1 # length
+
+# 14:17:21 >
+# 14:17:21 > "Done."
+# 14:17:21 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql
b/sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql
@@ -0,0 +1,113 @@
+START TRANSACTION;
+
+CREATE TABLE REGION ( R_REGIONKEY INTEGER NOT NULL,
+ R_NAME CHAR(25) NOT NULL,
+ R_COMMENT VARCHAR(152));
+
+CREATE TABLE NATION ( N_NATIONKEY INTEGER NOT NULL,
+ N_NAME CHAR(25) NOT NULL,
+ N_REGIONKEY INTEGER NOT NULL,
+ N_COMMENT VARCHAR(152));
+
+CREATE TABLE PART ( P_PARTKEY INTEGER NOT NULL,
+ P_NAME VARCHAR(55) NOT NULL,
+ P_MFGR CHAR(25) NOT NULL,
+ P_BRAND CHAR(10) NOT NULL,
+ P_TYPE VARCHAR(25) NOT NULL,
+ P_SIZE INTEGER NOT NULL,
+ P_CONTAINER CHAR(10) NOT NULL,
+ P_RETAILPRICE DECIMAL(15,2) NOT NULL,
+ P_COMMENT VARCHAR(23) NOT NULL );
+
+CREATE TABLE SUPPLIER ( S_SUPPKEY INTEGER NOT NULL,
+ S_NAME CHAR(25) NOT NULL,
+ S_ADDRESS VARCHAR(40) NOT NULL,
+ S_NATIONKEY INTEGER NOT NULL,
+ S_PHONE CHAR(15) NOT NULL,
+ S_ACCTBAL DECIMAL(15,2) NOT NULL,
+ S_COMMENT VARCHAR(101) NOT NULL);
+
+CREATE TABLE PARTSUPP ( PS_PARTKEY INTEGER NOT NULL,
+ PS_SUPPKEY INTEGER NOT NULL,
+ PS_AVAILQTY INTEGER NOT NULL,
+ PS_SUPPLYCOST DECIMAL(15,2) NOT NULL,
+ PS_COMMENT VARCHAR(199) NOT NULL );
+
+CREATE TABLE CUSTOMER ( C_CUSTKEY INTEGER NOT NULL,
+ C_NAME VARCHAR(25) NOT NULL,
+ C_ADDRESS VARCHAR(40) NOT NULL,
+ C_NATIONKEY INTEGER NOT NULL,
+ C_PHONE CHAR(15) NOT NULL,
+ C_ACCTBAL DECIMAL(15,2) NOT NULL,
+ C_MKTSEGMENT CHAR(10) NOT NULL,
+ C_COMMENT VARCHAR(117) NOT NULL);
+
+CREATE TABLE ORDERS ( O_ORDERKEY INTEGER NOT NULL,
+ O_CUSTKEY INTEGER NOT NULL,
+ O_ORDERSTATUS CHAR(1) NOT NULL,
+ O_TOTALPRICE DECIMAL(15,2) NOT NULL,
+ O_ORDERDATE DATE NOT NULL,
+ O_ORDERPRIORITY CHAR(15) NOT NULL,
+ O_CLERK CHAR(15) NOT NULL,
+ O_SHIPPRIORITY INTEGER NOT NULL,
+ O_COMMENT VARCHAR(79) NOT NULL);
+
+CREATE TABLE LINEITEM ( L_ORDERKEY INTEGER NOT NULL,
+ L_PARTKEY INTEGER NOT NULL,
+ L_SUPPKEY INTEGER NOT NULL,
+ L_LINENUMBER INTEGER NOT NULL,
+ L_QUANTITY DECIMAL(15,2) NOT NULL,
+ L_EXTENDEDPRICE DECIMAL(15,2) NOT NULL,
+ L_DISCOUNT DECIMAL(15,2) NOT NULL,
+ L_TAX DECIMAL(15,2) NOT NULL,
+ L_RETURNFLAG CHAR(1) NOT NULL,
+ L_LINESTATUS CHAR(1) NOT NULL,
+ L_SHIPDATE DATE NOT NULL,
+ L_COMMITDATE DATE NOT NULL,
+ L_RECEIPTDATE DATE NOT NULL,
+ L_SHIPINSTRUCT CHAR(25) NOT NULL,
+ L_SHIPMODE CHAR(10) NOT NULL,
+ L_COMMENT VARCHAR(44) NOT NULL);
+
+select
+ ref_188.type as c0,
+ ref_222.p_container as c1,
+ ref_188.schema as c2
+from
+ sys.netcdf_vardim as ref_140
+ left join bam.sq as ref_182
+ left join tmp.triggers as ref_183
+ left join sys.querylog_history as ref_184
+ inner join sys.users as ref_185 on (ref_184.mal =
ref_185.default_schema )
+ on (ref_183.table_id = ref_185.default_schema )
+ on (ref_182.file_id = ref_184.optimize )
+ right join tmp.objects as ref_186
+ on (ref_182.ln = ref_186.id )
+ on (ref_140.var_id = ref_185.default_schema )
+ left join sys.systemfunctions as ref_187
+ on (ref_140.dim_id = ref_187.function_id )
+ left join sys.storage as ref_188
+ left join sys.part as ref_222
+ left join sys.types as ref_227
+ inner join sys.lineitem as ref_228
+ on (ref_227.radix = ref_228.l_orderkey )
+ on (ref_222.p_type = ref_228.l_comment )
+ inner join sys.storage as ref_229
+ on (ref_227.eclass = ref_229.typewidth )
+ inner join sys.netcdf_files as ref_230
+ inner join sys.querylog_catalog as ref_231
+ on (ref_230.file_id = ref_231.mal )
+ inner join tmp.objects as ref_232
+ on (ref_230.file_id = ref_232.id )
+ left join sys.storagemodelinput as ref_233
+ on (ref_230.file_id = ref_233.typewidth )
+ right join sys.storage as ref_234
+ on (ref_232.nr = ref_234.typewidth )
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
