Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10712
Modified Files:
sql.mx
Log Message:
Make them dataflow save.
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -d -r1.382 -r1.383
--- sql.mx 30 Dec 2009 15:49:40 -0000 1.382
+++ sql.mx 31 Dec 2009 14:43:49 -0000 1.383
@@ -363,24 +363,24 @@
n := algebra.markT(e, 0:oid);
r := bat.reverse(n);
v := algebra.markH(e, 0:oid);
- bat.insert(b, "name", r);
- bat.insert(b, "value", v);
- return sql_environment := b;
+ b1:= bat.insert(b, "name", r);
+ b2:= bat.insert(b1, "value", v);
+ return sql_environment := b2;
end sql_environment;
function clients():bat[:str,:bat];
b := bat.new(:str,:bat,5);
u:= clients.getUsers();
- bat.insert(b,"user",u);
+ b1:= bat.insert(b,"user",u);
l:= clients.getLogins();
- bat.insert(b,"login",l);
+ b2:= bat.insert(b1,"login",l);
c:= clients.getLastCommand();
- bat.insert(b,"lastcommand",c);
+ b3:= bat.insert(b2,"lastcommand",c);
a:= clients.getActions();
- bat.insert(b,"actions",a);
+ b4:= bat.insert(b3,"actions",a);
t:= clients.getTime();
- bat.insert(b,"seconds",t);
- return clients := b;
+ b5:= bat.insert(b4,"seconds",t);
+ return clients := b5;
end clients;
function bbp():bat[:str,:bat];
@@ -389,39 +389,39 @@
ri := algebra.markT(ns, 0:oid);
i := bat.reverse(ri);
n := algebra.markH(ns, 0:oid);
- bat.insert(b, "id", i);
- bat.insert(b, "name", n);
+ b1:= bat.insert(b, "id", i);
+ b2:= bat.insert(b1, "name", n);
iht := bbp.getHeadType();
ht := algebra.markH(iht, 0:oid);
- bat.insert(b, "htype", ht);
+ b3:= bat.insert(b2, "htype", ht);
itt := bbp.getTailType();
tt := algebra.markH(itt, 0:oid);
- bat.insert(b, "ttype", tt);
+ b4:= bat.insert(b3, "ttype", tt);
icnt := bbp.getCount();
cnt := algebra.markH(icnt, 0:oid);
- bat.insert(b, "count", cnt);
+ b5:= bat.insert(b4, "count", cnt);
irefcnt := bbp.getRefCount();
refcnt := algebra.markH(irefcnt, 0:oid);
- bat.insert(b, "refcnt", refcnt);
+ b6:= bat.insert(b5, "refcnt", refcnt);
ilrefcnt := bbp.getLRefCount();
lrefcnt := algebra.markH(ilrefcnt, 0:oid);
- bat.insert(b, "lrefcnt", lrefcnt);
+ b7:= bat.insert(b6, "lrefcnt", lrefcnt);
ilocation := bbp.getLocation();
location := algebra.markH(ilocation, 0:oid);
- bat.insert(b, "location", location);
+ b8:= bat.insert(b7, "location", location);
iheat := bbp.getHeat();
heat := algebra.markH(iheat, 0:oid);
- bat.insert(b, "heat", heat);
+ b9:= bat.insert(b8, "heat", heat);
idirty := bbp.getDirty();
dirty := algebra.markH(idirty, 0:oid);
- bat.insert(b, "dirty", dirty);
+ b10:= bat.insert(b9, "dirty", dirty);
istatus := bbp.getStatus();
status := algebra.markH(istatus, 0:oid);
- bat.insert(b, "status", status);
+ b11:= bat.insert(b10, "status", status);
ikind := bbp.getKind();
kind := algebra.markH(ikind, 0:oid);
- bat.insert(b, "kind", kind);
- return bbp := b;
+ b12:= bat.insert(b11, "kind", kind);
+ return bbp := b12;
end bbp;
pattern sql_variables():bat[:str,:bat]
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
