Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16:/tmp/cvs-serv31468/src/backends/monet5
Modified Files:
sql_gencode.mx sql_optimizer.mx
Log Message:
cleanup some more pre-remap.optimzer code
approved some output of tests
bumped the SQL_VERSION (ie the catalog got changed by romulo)
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- sql_gencode.mx 7 Apr 2007 21:09:08 -0000 1.239
+++ sql_gencode.mx 17 Apr 2007 12:27:05 -0000 1.240
@@ -267,48 +267,17 @@
}
InstrPtr
-dump_multiplex(MalBlkPtr mb, char *mod, char *name /* should be eaten */, int
o1, int o2, int type, int rtype)
+multiplex2(MalBlkPtr mb, char *mod, char *name /* should be eaten */, int o1,
int o2, int rtype)
{
InstrPtr q;
- (void)type;
- q = newStmt(mb, "mal","multiplex");
- setVarType(mb,getArg(q,0), newBatType(TYPE_oid,rtype));
- freezeVarType(mb,getArg(q,0));
- q = pushStr(mb, q, convertMultiplexMod(mod,name));
- q = pushStr(mb, q, convertMultiplexFcn(name));
- q = pushArgument(mb, q, o1);
- q = pushArgument(mb, q, o2);
-/*
- int match=0;
-
- switch (*name){
- case '+': case '-': case '*': case '/': case '%':
- match=2;
- break;
- case '<': case '>': case '=': case '!':
- if( *(name+1) && *(name+1)=='=') match++; else
- if( *(name+1) == 0) match++;
- match= 2;
- }
- if (strcmp(name,"hash") == 0 || strcmp(name,"xor") == 0)
- match = 1;
- if( (match && type <= TYPE_str) || match==2){
- q = newStmt1(mb, batcalcRef, name);
- setVarType(mb,getArg(q,0), newBatType(TYPE_any,rtype));
- freezeVarType(mb,getArg(q,0));
- q = pushArgument(mb, q, o1);
- q = pushArgument(mb, q, o2);
- } else {
- q = newStmt(mb, "mal","multiplex");
- setVarType(mb,getArg(q,0), newBatType(TYPE_oid,rtype));
- freezeVarType(mb,getArg(q,0));
- q = pushStr(mb, q, convertMultiplexMod(mod,name));
- q = pushStr(mb, q, convertMultiplexFcn(name));
- q = pushArgument(mb, q, o1);
- q = pushArgument(mb, q, o2);
- }
-*/
+ q = newStmt(mb, "mal","multiplex");
+ setVarType(mb,getArg(q,0), newBatType(TYPE_oid,rtype));
+ freezeVarType(mb,getArg(q,0));
+ q = pushStr(mb, q, convertMultiplexMod(mod,name));
+ q = pushStr(mb, q, convertMultiplexFcn(name));
+ q = pushArgument(mb, q, o1);
+ q = pushArgument(mb, q, o2);
return q;
}
@@ -739,7 +708,7 @@
q = pushArgument(mb, q, r);
r = getDestVar(q);
- q=
dump_multiplex(mb,mod,convertOperator(op),l,r,tail_type(s->op2.stval)->type->localtype,
TYPE_bit);
+ q =
multiplex2(mb,mod,convertOperator(op),l,r,TYPE_bit);
k = getDestVar(q);
q = newStmt1(mb, algebraRef, "uselect");
@@ -1259,7 +1228,7 @@
backend_create_func(sql, s->op4.funcval->func);
if (s->op1.stval->nrcols || s->op2.stval->nrcols) {
if (!special) {
- q=
dump_multiplex(mb,mod,convertOperator(fimp),l,r,tail_type(s->op2.stval)->type->localtype,
s->op4.funcval->func->res.type->localtype);
+ q =
multiplex2(mb,mod,convertOperator(fimp),l,r,
s->op4.funcval->func->res.type->localtype);
} else {
mod= convertMultiplexMod(mod,fimp);
fimp= convertMultiplexFcn(fimp);
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- sql_optimizer.mx 7 Apr 2007 21:09:08 -0000 1.150
+++ sql_optimizer.mx 17 Apr 2007 12:27:05 -0000 1.151
@@ -256,8 +256,8 @@
{
int i, actions = 0;
lng clk = GDKusec();
- InstrPtr *rest= (InstrPtr*) alloca(sizeof(InstrPtr)*mb->stop);
int n=1,rtop=0;
+ InstrPtr *rest= (InstrPtr*) alloca(sizeof(InstrPtr)*mb->stop);
SQLbind *bind= (SQLbind*) alloca(sizeof(SQLbind)*mb->stop/2);
int j,k=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
