Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27554/src/backends/monet4
Modified Files:
sql_gencode.mx sql_server.mx sql_session.mx
Log Message:
propagated changes of Friday Mar 30 2007 - Monday Apr 02 2007
from the SQL_2-16 branch to the development trunk
Index: sql_session.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_session.mx,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- sql_session.mx 20 Feb 2007 11:50:45 -0000 1.222
+++ sql_session.mx 1 Apr 2007 22:08:55 -0000 1.223
@@ -209,7 +209,7 @@
/* TODO use sql_prepare/execute */
snprintf(buf, BUFSIZ, "INSERT INTO \"profile\" "
- "VALUES(now,'%s',%lld,%lld,%lld,%lld,USER);\n",
+ "VALUES(now,'%s',"LLFMT","LLFMT","LLFMT","LLFMT",USER);\n",
q, parse, optimize, exec, total);
_DELETE(query);
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- sql_server.mx 25 Mar 2007 20:46:05 -0000 1.162
+++ sql_server.mx 1 Apr 2007 22:08:55 -0000 1.163
@@ -1420,6 +1420,25 @@
proc in (any::2 b, any::2 v) : bit { return (b = v); }
proc [identity](bat[oid,any::1] b) : bat[oid,oid] { return mirror(b); }
+proc {mark_grp}(BAT[oid,any::1] b, any::2 a, BAT[oid,oid] g) : BAT[oid,oid] {
+ return [int](mark_grp(b,g,[EMAIL PROTECTED]));
+}
+proc mark_grp(BAT[oid,any::1] b) : BAT[oid,oid] {
+ return [int](mark(b,[EMAIL PROTECTED]));
+}
+proc {rank_grp}(BAT[oid,any::1] b, BAT[oid,oid] gp, BAT[oid,oid] gpe) :
BAT[oid,oid] {
+ var g := CTderive(gp,b);
+ var m := g.map();
+ var e := [int](g.extend().mirror());
+ return join(m, e);
+}
+proc rank_grp(BAT[oid,any::1] b) : BAT[oid,int] {
+ var g := CTgroup(b);
+ var m := g.map();
+ var e := [int](g.extend().mirror());
+ return join(m, e);
+}
+
tzone_local(TIMEZONE("GMT"));
proc sql_server_start() : void {
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- sql_gencode.mx 21 Feb 2007 14:00:43 -0000 1.149
+++ sql_gencode.mx 1 Apr 2007 22:08:54 -0000 1.150
@@ -526,6 +526,12 @@
case cmp_gte:
op = ">=";
break;
+ case cmp_like:
+ op = "like";
+ break;
+ case cmp_notlike:
+ op = "notlike";
+ break;
default:
len = snprintf(buf, BUFSIZ, "error
impossible\n");
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
