Changeset: 3da0ea9ebe3e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3da0ea9ebe3e Added Files: sql/test/Tests/setoptimizer.stable.out.Windows Modified Files: clients/ChangeLog.Apr2012 clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/mclient.1 clients/mapiclient/mclient.c monetdb5/Makefile.ag monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows monetdb5/optimizer/opt_pipes.c sql/backends/monet5/Tests/optimizers.stable.err sql/rel.txt sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/mapi/Tests/php_monetdb.stable.out Branch: sciql Log Message:
merge
diffs (truncated from 2091 to 300 lines):
diff --git a/clients/ChangeLog.Apr2012 b/clients/ChangeLog.Apr2012
--- a/clients/ChangeLog.Apr2012
+++ b/clients/ChangeLog.Apr2012
@@ -1,3 +1,6 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Mar 6 2012 Sjoerd Mullender <sjo...@acm.org>
+- mclient now has a -a (--autocommit) option to turn off autocommit mode.
+
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -32,6 +32,7 @@ Options are:
SQL specific opions
-n nullstr | --null=nullstr change NULL representation for sql, csv and
tab output modes
+ -a | --autocommit turn off autocommit mode
-r nr | --rows=nr for pagination
-w nr | --width=nr for pagination
-D | --dump create an SQL dump
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -31,6 +31,7 @@ Options are:
SQL specific opions
-n nullstr | --null=nullstr change NULL representation for sql, csv and
tab output modes
+ -a | --autocommit turn off autocommit mode
-r nr | --rows=nr for pagination
-w nr | --width=nr for pagination
-D | --dump create an SQL dump
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -190,7 +190,7 @@ Save client/server interaction in the sp
Execute the specified query. The query is run before any queries from
files specified on the command line are run.
.TP
-\fB\--timezone\fP (\fB\-z\fP)
+\fB\-\-timezone\fP (\fB\-z\fP)
Do not tell the client's timezone to the server.
.TP
\fB\-\-Xdebug\fP (\fB\-X\fP)
@@ -218,6 +218,10 @@ empty string in the csv and tab output f
Note that an argument is required, so in order to use the empty
string, use \fB\-n ""\fP (with the space) or \fB\-\-null=\fP.
.TP
+\fB\-\-autocommit\fP (\fB\-a\fP)
+Switch autocommit mode off.
+By default, autocommit mode is on.
+.TP
\fB\-\-rows=\fP\fInr\fP (\fB\-r\fP \fInr\fP)
If specified, query results will be paged by an internal pager at the
specified number of lines.
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2556,6 +2556,7 @@ usage(const char *prog, int xit)
fprintf(stderr, "\nSQL specific opions \n");
fprintf(stderr, " -n nullstr | --null=nullstr change NULL
representation for sql, csv and tab output modes\n");
+ fprintf(stderr, " -a | --autocommit turn off autocommit
mode\n");
fprintf(stderr, " -r nr | --rows=nr for pagination\n");
fprintf(stderr, " -w nr | --width=nr for pagination\n");
fprintf(stderr, " -D | --dump create an SQL
dump\n");
@@ -2586,10 +2587,12 @@ main(int argc, char **argv)
int has_fileargs = 0;
int option_index = 0;
int settz = 1;
+ int autocommit = 1; /* autocommit mode default on */
struct stat statb;
stream *config = NULL;
char user_set_as_flag = 0;
static struct option long_options[] = {
+ {"autocommit", 0, 0, 'a'},
{"database", 1, 0, 'd'},
{"dump", 0, 0, 'D'},
{"inserts", 0, 0, 'N'},
@@ -2733,7 +2736,7 @@ main(int argc, char **argv)
mnstr_destroy(config);
}
- while ((c = getopt_long(argc, argv, "DNd:e"
+ while ((c = getopt_long(argc, argv, "aDNd:e"
#ifdef HAVE_ICONV
"E:"
#endif
@@ -2755,6 +2758,9 @@ main(int argc, char **argv)
}
#endif
break;
+ case 'a':
+ autocommit = 0;
+ break;
case 'e':
echoquery = 1;
break;
@@ -2950,6 +2956,9 @@ main(int argc, char **argv)
}
}
+ if (!autocommit)
+ mapi_setAutocommit(mid, autocommit);
+
if (logfile)
mapi_log(mid, logfile);
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -4867,6 +4867,30 @@ end main;
[ "avg", "command", "aggr",
"(b:bat[:any_1,:int]):dbl ",
"ALGavg_int;"
]
[ "avg", "command", "aggr",
"(b:bat[:any_1,:sht]):dbl ",
"ALGavg_sht;"
]
[ "avg", "command", "aggr",
"(b:bat[:any_1,:bte]):dbl ",
"ALGavg_bte;"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;",
"nil" ]
[ "count_no_nil", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] ",
"AX3count_no_nil3;" ]
[ "count", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] ",
"AX3aggrX3_count3Nils;"
]
[ "count_no_nil", "command", "aggr",
"(b:bat[:oid,:any_1],e:bat[:oid,:any_1]):bat[:oid,:wrd] ",
"AX3count_no_nil2;"
]
@@ -4967,6 +4991,30 @@ end main;
[ "prod", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):sht ",
"ALGprod_bte_sht;"
]
[ "prod", "function", "aggr",
"(b:bat[:any_1,:bte]):bte;",
"nil"
]
[ "prod", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):bte ",
"ALGprod_bte_bte;"
]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:flt]):flt;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:lng]):lng;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:int]):int;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:sht]):sht;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:bte]):bte;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil" ]
[ "size", "command", "aggr",
"(b:bat[:void,:bit],e:bat[:void,:any_1]):bat[:void,:wrd] ",
"AX3aggrX3_size;"
]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum3_dbl_dbl;" ]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum_dbl_dbl;" ]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -4861,6 +4861,30 @@ end main;
[ "avg", "command", "aggr",
"(b:bat[:any_1,:int]):dbl ",
"ALGavg_int;"
]
[ "avg", "command", "aggr",
"(b:bat[:any_1,:sht]):dbl ",
"ALGavg_sht;"
]
[ "avg", "command", "aggr",
"(b:bat[:any_1,:bte]):dbl ",
"ALGavg_bte;"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;",
"nil" ]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil"
]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil"
]
+[ "corr", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;",
"nil" ]
+[ "covar", "function", "aggr",
"(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;",
"nil" ]
[ "count_no_nil", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] ",
"AX3count_no_nil3;" ]
[ "count", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd] ",
"AX3aggrX3_count3Nils;"
]
[ "count_no_nil", "command", "aggr",
"(b:bat[:oid,:any_1],e:bat[:oid,:any_1]):bat[:oid,:wrd] ",
"AX3count_no_nil2;"
]
@@ -4961,6 +4985,30 @@ end main;
[ "prod", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):sht ",
"ALGprod_bte_sht;"
]
[ "prod", "function", "aggr",
"(b:bat[:any_1,:bte]):bte;",
"nil"
]
[ "prod", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):bte ",
"ALGprod_bte_bte;"
]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:flt]):flt;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:lng]):lng;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:int]):int;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:sht]):sht;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil" ]
+[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
+[ "stddev", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil" ]
+[ "stddev", "function", "aggr",
"(e:bat[:oid,:bte]):bte;",
"nil" ]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil" ]
[ "size", "command", "aggr",
"(b:bat[:void,:bit],e:bat[:void,:any_1]):bat[:void,:wrd] ",
"AX3aggrX3_size;"
]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum3_dbl_dbl;" ]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum_dbl_dbl;" ]
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -41,387 +41,375 @@
#define MAXOPTPIPES 64
-struct PIPELINES{
+struct PIPELINES {
char *name;
char *def;
char *status;
char *prerequisite;
MalBlkPtr mb;
-} pipes[MAXOPTPIPES] ={
+} pipes[MAXOPTPIPES] = {
/* The minimal pipeline necessary by the server to operate correctly*/
-{ "minimal_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.deadcode();"
- "optimizer.multiplex();"
- "optimizer.garbageCollector();",
- "stable",0,0},
-
-/*
- * The default pipe line contains as of Feb2010 mitosis-mergetable-reorder,
- * aimed at large tables and improved access locality
+ {"minimal_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.deadcode();"
+ "optimizer.multiplex();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* The default pipe line contains as of Feb2010
+ * mitosis-mergetable-reorder, aimed at large tables and improved
+ * access locality
+ */
+ {"default_pipe",
+ "optimizer.inline();"
+ "optimizer.remap();"
+ "optimizer.evaluate();"
+ "optimizer.costModel();"
+ "optimizer.coercions();"
+ "optimizer.emptySet();"
+ "optimizer.aliases();"
+ "optimizer.mitosis();"
+ "optimizer.mergetable();"
+ "optimizer.deadcode();"
+ "optimizer.commonTerms();"
+ "optimizer.joinPath();"
+ "optimizer.reorder();"
+ "optimizer.deadcode();"
+ "optimizer.reduce();"
+ "optimizer.dataflow();"
+ "optimizer.history();"
+ "optimizer.multiplex();"
+ "optimizer.accumulators();"
+ "optimizer.garbageCollector();",
+ "stable", 0, 0},
+/* The no_mitosis pipe line is (and should be kept!) identical to the
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
