Changeset: 7dd6daf16b6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dd6daf16b6a
Modified Files:
monetdb5/optimizer/opt_macro.mx
sql/backends/monet5/sql_gencode.c
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/mapi/Tests/perl_dbi.stable.out
Branch: default
Log Message:
(temporarily) don't inline table returning functions
This fixes the hanging zones test, still a different
problem surfaced.
diffs (107 lines):
diff --git a/monetdb5/optimizer/opt_macro.mx b/monetdb5/optimizer/opt_macro.mx
--- a/monetdb5/optimizer/opt_macro.mx
+++ b/monetdb5/optimizer/opt_macro.mx
@@ -292,9 +292,6 @@ inlineMALblock(MalBlkPtr mb, int pc, Mal
for (n = 0; n < mc->vtop; n++) {
VarPtr ov, v;
-/*
- nv[n]= cloneVariable(mb,mc,n);
-*/
if (isExceptionVariable(mc->var[n]->name)) {
nv[n] =
newVariable(mb,GDKstrdup(mc->var[n]->name),TYPE_str);
if (isVarUDFtype(mc,n))
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2408,7 +2408,7 @@ backend_create_func(backend *be, sql_fun
p->barrier == RETURNsymbol || p->barrier == YIELDsymbol)
retseen++;
}
- if (i == curBlk->stop && retseen == 1)
+ if (i == curBlk->stop && retseen == 1 && !f->res.comp_type)
varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq,
NULL);
if ( sideeffects)
varSetProp(curBlk, getArg(curInstr, 0), unsafeProp, op_eq,
NULL);
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
@@ -68,9 +68,9 @@ stderr of test 'select_from_env.SF-12407
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = monetdb@alf:33179
+MAPI = monetdb@niels:37002
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (19>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (20>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
@@ -41,6 +41,7 @@ Over..
[ "mapi_autosense" ]
[ "mapi_open" ]
[ "mapi_port" ]
+[ "max_clients" ]
[ "monet_daemon" ]
[ "monet_mod_path" ]
[ "monet_pid" ]
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,10 +80,10 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = monetdb@alf:33726
+MAPI = monetdb@niels:37002
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (19>1)
-MAPI = monetdb@alf:33726
+ERROR = !SQLException:zero_or_one:cardinality violation (20>1)
+MAPI = monetdb@niels:37002
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !SQLException:zero_or_one:cardinality violation (296>1)
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -42,7 +42,6 @@ Over..
[ "oid", "int", 1151 ]
[ "oid", "int", 1151 ]
[ "oid", "int", 1151 ]
-[ "oid", "int", 1151 ]
[ "oid", "int", 3163 ]
[ "oid", "int", 3163 ]
[ "oid", "int", 3163 ]
@@ -62,13 +61,13 @@ Over..
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 486 ]
+[ "transient", 487 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
% char, wrd # type
% 10, 2 # length
-[ "persistent", 25 ]
+[ "persistent", 24 ]
# 22:02:15 >
# 22:02:15 > Done.
diff --git a/sql/test/mapi/Tests/perl_dbi.stable.out
b/sql/test/mapi/Tests/perl_dbi.stable.out
--- a/sql/test/mapi/Tests/perl_dbi.stable.out
+++ b/sql/test/mapi/Tests/perl_dbi.stable.out
@@ -35,7 +35,7 @@ Start a simple Monet SQL interaction
data sources: dbi:monetdb:
field[0]: 2, last index: 0
field[0]: 3, last index: 0
-ERROR REPORTED: DBD::monetdb::st execute failed: syntax error, unexpected
IDENT, expecting SELECT or '(' in: "( xyz" at
/ufs/manegold/_/scratch0/Monet/HG/Aug2011/prefix/--disable-debug_--enable-optimize_--disable-assert/lib64/perl5/MonetDB/CLI/MapiPP.pm
line 120.
+ERROR REPORTED: DBD::monetdb::st execute failed: syntax error, unexpected
IDENT, expecting SELECT or '(' in: "( xyz" at
/home/niels/scratch/monetdb/Linux-x86_64/lib64/perl5/vendor_perl/MonetDB/CLI/MapiPP.pm
line 110.
bun: 3, three
bun: 7, seven
rows: 2, fields: 2
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
