Changeset: de9132bb6580 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de9132bb6580
Modified Files:
monetdb5/optimizer/opt_pipes.mx
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/bugs/Tests/predicate_or-sf-1409824.sql
sql/test/bugs/Tests/simple_view.stable.out
Branch: default
Log Message:
approved test after changes (some time ago) in the config setup
do not return default pipe, when looking up optimizers pipes.
Restores seting pipe line from sql.
diffs (87 lines):
diff --git a/monetdb5/optimizer/opt_pipes.mx b/monetdb5/optimizer/opt_pipes.mx
--- a/monetdb5/optimizer/opt_pipes.mx
+++ b/monetdb5/optimizer/opt_pipes.mx
@@ -124,11 +124,11 @@
getPipeDefinition(str name)
{
int i;
+
for( i=0; *pipes[i].name; i++)
- if ( strcmp(name, pipes[i].name) == 0)
- return GDKstrdup(pipes[i].def);
-
- return GDKstrdup(pipes[0].def);
+ if ( strcmp(name, pipes[i].name) == 0)
+ return GDKstrdup(pipes[i].def);
+ return NULL;
}
str
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 @@
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = monetdb@alf:30032
+MAPI = monetdb@alf:35734
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (23>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (21>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
@@ -44,8 +44,6 @@
[ "sql_optimizer" ]
[ "sql_debug" ]
[ "gdk_nr_threads" ]
-[ "xrpc_open" ]
-[ "xrpc_port" ]
[ "mal_listing" ]
[ "gdk_mem_pagebits" ]
[ "gdk_mem_bigsize" ]
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 @@
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = monetdb@alf:32997
+MAPI = monetdb@alf:35734
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (23>1)
-MAPI = monetdb@alf:32997
+ERROR = !SQLException:zero_or_one:cardinality violation (21>1)
+MAPI = monetdb@alf:35734
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 (295>1)
diff --git a/sql/test/bugs/Tests/predicate_or-sf-1409824.sql
b/sql/test/bugs/Tests/predicate_or-sf-1409824.sql
--- a/sql/test/bugs/Tests/predicate_or-sf-1409824.sql
+++ b/sql/test/bugs/Tests/predicate_or-sf-1409824.sql
@@ -6,7 +6,7 @@
select * from p1409824 where 0 = 1 or name = 'name4';
select * from p1409824 where name = 'name4' or 0 = 1;
-select * from env() as env where 0 = 1 or name = 'host';
-select * from env() as env where name = 'host' or 0 = 1;
+select * from env() as env where 0 = 1 or name = 'sql_debug';
+select * from env() as env where name = 'sql_debug' or 0 = 1;
drop table p1409824;
diff --git a/sql/test/bugs/Tests/simple_view.stable.out
b/sql/test/bugs/Tests/simple_view.stable.out
--- a/sql/test/bugs/Tests/simple_view.stable.out
+++ b/sql/test/bugs/Tests/simple_view.stable.out
@@ -58,7 +58,6 @@
[ "queryhistory", "str", 1 ]
[ "callhistory", "str", 1 ]
[ "querylog", "str", 1 ]
-[ "graph", "str", 1 ]
[ "systemfunctions", "str", 1 ]
[ "test_update", "str", 1 ]
[ " ", "str", 1 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
