Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19697
Modified Files:
sql.mx sql_optimizer.mx
Log Message:
Add the clients wrapper.
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- sql_optimizer.mx 18 Aug 2007 09:11:44 -0000 1.159
+++ sql_optimizer.mx 8 Sep 2007 18:59:00 -0000 1.160
@@ -490,7 +490,7 @@
nxt++;
}
if (strcmp(optimizer,"default")==0){
- str base= GDKstrdup(defaultPlan);
+ str base= GDKstrdup(defaultPlan?
defaultPlan:minimalPlan);
addOptimizers(c,mb,base);
GDKfree(base);
} else if ((nme = getName(optimizer,strlen(optimizer))) == 0) {
@@ -543,7 +543,7 @@
}
optimizer = stack_get_string(be->mvc, "optimizer");
if( optimizer == 0 )
- optimizer= defaultPlan;
+ optimizer= defaultPlan? defaultPlan:minimalPlan;
#ifdef _SQL_OPTIMIZER_DEBUG
if( optimizer)
stream_printf(c->fdout,"optimizer:%s:\n",optimizer?optimizer:"unknown");
@@ -557,10 +557,10 @@
care of.
@c
if( strcmp(optimizer,"on")==0 || strcmp(optimizer,"default")==0 ){
- str base = GDKstrdup(defaultPlan);
+ str base = GDKstrdup(defaultPlan? defaultPlan:minimalPlan);
stack_set_var(be->mvc, "optimizer",
- VALset(&src, TYPE_str, defaultPlan));
+ VALset(&src, TYPE_str, defaultPlan?
defaultPlan:minimalPlan));
addOptimizers(c,mb, base);
optimizeMALBlock(mb);
GDKfree(base);
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- sql.mx 5 Sep 2007 08:25:56 -0000 1.232
+++ sql.mx 8 Sep 2007 18:59:00 -0000 1.233
@@ -221,6 +221,21 @@
return b;
end sql_environment;
+function clients():bat[:str,:bat];
+ b := bat.new(:str,:bat,5);
+ u:= bbp.getUsers();
+ bat.inser(b,"user",u);
+ l:= bbp.getLogins();
+ bat.inser(b,"login",l);
+ c:= bbp.getLastCommand();
+ bat.inser(b,"lastcommand",c);
+ a:= bbp.getActions();
+ bat.inser(b,"actions",a);
+ t:= bbp.getTime();
+ bat.inser(b,"seconds",t);
+ return b;
+end clients;
+
function bbp():bat[:str,:bat];
b := bat.new(:str,:bat,12);
ns := bbp.getNames();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
