Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4250/src/backends/monet5
Modified Files:
sql_gencode.mx
Log Message:
propagated changes of Tuesday Jul 14 2009 - Monday Jul 20 2009
from the May2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/07/14 - mr-meltdown: src/backends/monet5/sql_gencode.mx,1.319.2.6
fix some spacing, no content change
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- sql_gencode.mx 28 Jun 2009 11:56:42 -0000 1.328
+++ sql_gencode.mx 20 Jul 2009 13:56:30 -0000 1.329
@@ -1347,9 +1347,9 @@
char *aggrfunc = s->op4.aggrval->aggr->imp;
int restype = s->op4.aggrval->res.type->localtype;
int output_type_needed = 0;
-
- if (strcmp(aggrfunc, "sum") == 0
- || strcmp(aggrfunc, "prod") == 0 )
+
+ if (strcmp(aggrfunc, "sum") == 0 ||
+ strcmp(aggrfunc, "prod") == 0)
output_type_needed = 1;
if (s->flag) {
@@ -1364,8 +1364,8 @@
int e = _dumpstmt(sql, mb, s->op3.stval);
q = newStmt(mb, mod, aggrfunc);
- setVarType(mb, getArg(q, 0),
newBatType(TYPE_any,restype));
- setVarUDFtype(mb,getArg(q,0));
+ setVarType(mb, getArg(q, 0),
newBatType(TYPE_any, restype));
+ setVarUDFtype(mb, getArg(q, 0));
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, g);
q = pushArgument(mb, q, e);
@@ -1373,7 +1373,7 @@
q = newStmt(mb, mod, aggrfunc);
if (output_type_needed){
setVarType(mb, getArg(q, 0), restype);
- setVarUDFtype(mb,getArg(q,0));
+ setVarUDFtype(mb, getArg(q, 0));
}
q = pushArgument(mb, q, l);
}
@@ -1609,7 +1609,8 @@
/* single value result, has a fast exit */
if (cnt == 1 && !order && f->nrcols <= 0 &&
- s->type != st_export){
+ s->type != st_export)
+ {
stmt *c = n->data;
sql_subtype *t = tail_type(c);
char *tname = table_name(c);
@@ -1620,7 +1621,8 @@
char *cn = column_name(c);
char *ntn = sql_escape_ident(tn);
char *nsn = sql_escape_ident(sn);
- char *fqtn = alloca(sizeof(char) *
(strlen(nsn) + 1 + strlen(ntn) + 1));
+ char *fqtn = alloca(sizeof(char) *
(strlen(nsn) + 1 +
+ strlen(ntn) +
1));
fqtn[0]=0;
strcat(fqtn, nsn);
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
