Update of /cvsroot/monetdb/sql/src/backends/monet5/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27458/Tests
Modified Files:
Tag: Nov2009
optimizers.sql optimizers.stable.err optimizers.stable.out
Log Message:
Move the validation of the optimizer pipeline to the assignment itself,
rather then checking them on the first call.
Index: optimizers.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Tests/optimizers.stable.out,v
retrieving revision 1.10.4.3
retrieving revision 1.10.4.4
diff -u -d -r1.10.4.3 -r1.10.4.4
--- optimizers.stable.out 10 Nov 2009 00:47:58 -0000 1.10.4.3
+++ optimizers.stable.out 15 Nov 2009 16:55:27 -0000 1.10.4.4
@@ -53,73 +53,13 @@
% ., . # table_name
% single_value, single_value # name
% char, varchar # type
-% 15, 0 # length
-[ "optimizer test:", "" ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 115 # length
-[ "optimizer test:",
"costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 105 # length
-[ "optimizer test:",
"coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 95 # length
-[ "optimizer test:",
"emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 86 # length
-[ "optimizer test:",
"accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 75 # length
-[ "optimizer test:",
"aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 67 # length
-[ "optimizer test:",
"commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 55 # length
-[ "optimizer test:",
"accumulators,joinPath,deadcode,reduce,garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 42 # length
-[ "optimizer test:", "joinPath,deadcode,reduce,garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 33 # length
-[ "optimizer test:", "deadcode,reduce,garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 24 # length
-[ "optimizer test:", "reduce,garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 17 # length
-[ "optimizer test:", "garbageCollector," ]
-% ., . # table_name
-% single_value, single_value # name
-% char, varchar # type
-% 15, 107 # length
-[ "optimizer test:",
"costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,"
]
+% 15, 2 # length
+[ "optimizer test:", "on" ]
% ., . # table_name
% single_value, single_value # name
% char, varchar # type
-% 15, 100 # length
-[ "optimizer test:",
"costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector,"
]
+% 15, 0 # length
+[ "optimizer test:", "" ]
% . # table_name
% single_value # name
% char # type
Index: optimizers.stable.err
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Tests/optimizers.stable.err,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -d -r1.5.4.2 -r1.5.4.3
--- optimizers.stable.err 9 Nov 2009 22:49:11 -0000 1.5.4.2
+++ optimizers.stable.err 15 Nov 2009 16:55:27 -0000 1.5.4.3
@@ -12,70 +12,46 @@
# 08:05:50 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=gio --port=35043
# 08:05:50 >
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
+QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
+ERROR = !SQLException:optimizer: 'inline' should be the first
+MAPI = mone...@eir:35929
QUERY = set
optimizer='coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set
optimizer='emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set
optimizer='accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set
optimizer='aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set
optimizer='commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set
optimizer='accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set optimizer='joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set optimizer='deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set optimizer='reduce,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+MAPI = mone...@eir:35929
QUERY = set optimizer='garbageCollector,';
-ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: 'deadcode' should be used at least once
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
+ERROR = !SQLException:optimizer:Optimizer 'garbageCollector,' does not exist,
use default pipe instead
+MAPI = mone...@eir:35929
QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
ERROR = !SQLException:optimizer:Optimizer 'garbageCollector,' does not exist,
use default pipe instead
-MAPI = mone...@eir:38510
+ !SQLException:optimizer: 'inline' should be the first
+MAPI = mone...@eir:35929
QUERY = set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector,';
ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
-MAPI = mone...@eir:38510
-QUERY = select 'done';
-ERROR = !SQLException:optimizer: 'inline' should be the first
- !SQLException:optimizer: 'multiplex' should be the last
- !SQLException:optimizer: Invalid pipeline, use default_pipe instead
# 08:05:51 >
# 08:05:51 > Done.
Index: optimizers.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Tests/optimizers.sql,v
retrieving revision 1.2
retrieving revision 1.2.18.1
diff -u -d -r1.2 -r1.2.18.1
--- optimizers.sql 1 Jul 2007 14:34:36 -0000 1.2
+++ optimizers.sql 15 Nov 2009 16:55:27 -0000 1.2.18.1
@@ -7,46 +7,36 @@
set optimizer='off';
select 'optimizer test:',optimizer;
+set optimizer='on';
+select 'optimizer test:',optimizer;
+
set optimizer='';
select 'optimizer test:',optimizer;
set
optimizer='costModel,coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='coercions,emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='emptySet,accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='accessmode,aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='aliases,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set optimizer='accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set optimizer='joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set optimizer='deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set optimizer='reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set optimizer='garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,reduce,garbageCollector,';
-select 'optimizer test:',optimizer;
set
optimizer='costModel,coercions,emptySet,accessmode,commonTerms,accumulators,joinPath,deadcode,garbageCollector,';
-select 'optimizer test:',optimizer;
select 'done';
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
