Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13880
Modified Files:
sql_optimizer.mx
Log Message:
Just a macro renaming
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- sql_optimizer.mx 8 May 2007 20:33:36 -0000 1.154
+++ sql_optimizer.mx 1 Jun 2007 06:49:02 -0000 1.155
@@ -269,8 +269,8 @@
if( getModuleId(p) == sqlRef &&
(f == bindRef || f == bindidxRef || f == binddbatRef ) ){
- char *sname = getVarConstant(mb, getArg(p,1)).val.sval;
- char *tname = getVarConstant(mb, getArg(p,2)).val.sval;
+ char *sname = getConstant(mb, getArg(p,1)).val.sval;
+ char *tname = getConstant(mb, getArg(p,2)).val.sval;
char *cname = NULL;
int not_null = 0;
BAT *b;
@@ -278,10 +278,10 @@
int mode;
if (f == binddbatRef) {
- mode = getVarConstant(mb, getArg(p,3)).val.ival;
+ mode = getConstant(mb, getArg(p,3)).val.ival;
} else {
- cname = getVarConstant(mb,
getArg(p,3)).val.sval;
- mode = getVarConstant(mb, getArg(p,4)).val.ival;
+ cname = getConstant(mb, getArg(p,3)).val.sval;
+ mode = getConstant(mb, getArg(p,4)).val.ival;
}
/* Mark to be updated columns */
@@ -349,7 +349,7 @@
bit t = TRUE;
rows += BATcount(b);
- getVarConstant(mb, k).val.bval = b->batCacheid;
+ getConstant(mb, k).val.bval = b->batCacheid;
if (mb->var[k]->props == 0)
mb->var[k]->props = newPropertySet();
setProperty(getProps(mb,k),"bid", "=",
TYPE_int, &b->batCacheid);
@@ -361,10 +361,10 @@
}
} else if (getModuleId(p) == sqlRef &&
f == appendRef && p->argc == 6 ) {
- char *sname = getVarConstant(mb, getArg(p,1)).val.sval;
- char *tname = getVarConstant(mb, getArg(p,2)).val.sval;
- char *cname = getVarConstant(mb, getArg(p,3)).val.sval;
- int mode = getVarConstant(mb, getArg(p,4)).val.ival;
+ char *sname = getConstant(mb, getArg(p,1)).val.sval;
+ char *tname = getConstant(mb, getArg(p,2)).val.sval;
+ char *cname = getConstant(mb, getArg(p,3)).val.sval;
+ int mode = getConstant(mb, getArg(p,4)).val.ival;
for(j=0; j<k; j++) {
if( strcmp(sname,bind[j].schema)==0 &&
strcmp(tname,bind[j].table)==0 &&
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
