Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25054/src/backends/monet5
Modified Files:
sql_gencode.mx
Log Message:
use more name 'Ref'erences.
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- sql_gencode.mx 12 Nov 2007 22:22:00 -0000 1.250
+++ sql_gencode.mx 14 Nov 2007 13:32:21 -0000 1.251
@@ -245,7 +245,7 @@
int o1 = _dumpstmt(sql, mb, s->op1.stval);
@:SQLprelude@
- q = newStmt1(mb, mod, name);
+ q = newStmt2(mb, mod, name);
q = pushArgument(mb, q, o1);
s->nr = getDestVar(q);
@:SQLpostlude@
@@ -259,7 +259,7 @@
int o2 = _dumpstmt(sql, mb, s->op2.stval);
@:SQLprelude@
- q = newStmt1(mb, mod, name);
+ q = newStmt2(mb, mod, name);
q = pushArgument(mb, q, o1);
q = pushArgument(mb, q, o2);
s->nr = getDestVar(q);
@@ -452,7 +452,7 @@
int tt = s->op1.cval->type.type->localtype;
@:SQLprelude@
- q = newStmt1(mb, sqlRef, bindRef);
+ q = newStmt2(mb, sqlRef, bindRef);
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
freezeVarType(mb,getArg(q,0));
q = pushStr(mb, q, s->op1.cval->t->s->base.name);
@@ -466,7 +466,7 @@
case st_dbat:{
int ht = TYPE_oid;
@:SQLprelude@
- q = newStmt1(mb, sqlRef, binddbatRef);
+ q = newStmt2(mb, sqlRef, binddbatRef);
setVarType(mb, getArg(q,0), newBatType(ht,TYPE_oid));
freezeVarType(mb,getArg(q,0));
q = pushStr(mb, q, s->op1.tval->s->base.name);
@@ -481,7 +481,7 @@
int ht = TYPE_oid;
@:SQLprelude@
- q = newStmt1(mb, sqlRef, "bind_idxbat");
+ q = newStmt2(mb, sqlRef, bindidxRef);
tt = tail_type(s)->type->localtype;
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
freezeVarType(mb,getArg(q,0));
@@ -494,15 +494,15 @@
}
break;
case st_const:{
- dump_2(sql, mb, s, algebraRef, "project");
+ dump_2(sql, mb, s, algebraRef, projectRef);
}
break;
case st_mark:{
- dump_2(sql, mb, s, algebraRef, "markT");
+ dump_2(sql, mb, s, algebraRef, markTRef);
}
break;
case st_gen_group:{
- dump_1(sql, mb, s, algebraRef, "groupby");
+ dump_1(sql, mb, s, algebraRef, groupbyRef);
}
break;
case st_reverse:{
@@ -510,7 +510,7 @@
}
break;
case st_mirror:{
- dump_1(sql, mb, s, batRef, "mirror");
+ dump_1(sql, mb, s, batRef, mirrorRef);
}
break;
case st_limit:{
@@ -689,7 +689,7 @@
q = pushOid(mb, q, 0);
mhj = getDestVar(q);
- q = newStmt1(mb, algebraRef, "markT");
+ q = newStmt2(mb, algebraRef, markTRef);
q = pushArgument(mb, q, j);
q = pushOid(mb, q, 0);
mtj = getDestVar(q);
@@ -711,7 +711,7 @@
q =
multiplex2(mb,mod,convertOperator(op),l,r,TYPE_bit);
k = getDestVar(q);
- q = newStmt1(mb, algebraRef, "uselect");
+ q = newStmt2(mb, algebraRef, uselectRef);
q = pushArgument(mb, q, k);
q = pushBit(mb, q, TRUE);
k = getDestVar(q);
@@ -760,7 +760,7 @@
q = pushArgument(mb, q, l);
q = pushNil(mb, q, TYPE_void);
l = getDestVar(q);
- q = newStmt1(mb, algebraRef,
"kdifference");
+ q = newStmt2(mb, algebraRef,
kdifferenceRef);
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, k);
break;
@@ -826,7 +826,7 @@
int l = _dumpstmt(sql, mb, s->op1.stval);
int r1 = _dumpstmt(sql, mb, s->op2.stval);
int r2 = _dumpstmt(sql, mb, s->op3.stval);
- char *cmd = st_uselect2 == s->type ? "uselect" :
"select";
+ char *cmd = st_uselect2 == s->type ? uselectRef :
selectRef;
@:SQLprelude@
@@ -835,14 +835,14 @@
atom_null(s->op2.stval->op1.aval) &&
atom_null(s->op3.stval->op1.aval)
) {
- q = newStmt1(mb, algebraRef, "selectNotNil");
+ q = newStmt2(mb, algebraRef, selectNotNilRef);
q = pushArgument(mb, q, l);
s->nr = getDestVar(q);
@:SQLpostlude@
break;
}
- q = newStmt1(mb, algebraRef, cmd);
+ q = newStmt2(mb, algebraRef, cmd);
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, r1);
q = pushArgument(mb, q, r2);
@@ -871,7 +871,6 @@
break;
case st_semijoin:{
if (s->op1.stval->h && s->op1.stval->h ==
s->op2.stval->h){
- /* dump_2(sql, mb, s, sqlRef, "sql_semijoin");*/
InstrPtr mp,mq;
int o1 = _dumpstmt(sql, mb, s->op1.stval);
int o2 = _dumpstmt(sql, mb, s->op2.stval);
@@ -884,15 +883,15 @@
s->nr = getDestVar(mq);
@:SQLpostlude@
} else
- dump_2(sql, mb, s, algebraRef, "semijoin");
+ dump_2(sql, mb, s, algebraRef, semijoinRef);
}
break;
case st_diff:{
- dump_2(sql, mb, s, algebraRef, "kdifference");
+ dump_2(sql, mb, s, algebraRef, kdifferenceRef);
}
break;
case st_union:{
- dump_2(sql, mb, s, algebraRef, "kunion");
+ dump_2(sql, mb, s, algebraRef, kunionRef);
}
break;
case st_outerjoin:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
