Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17920/src/backends/monet5
Modified Files:
sql_gencode.mx
Log Message:
use the new anti-select
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- sql_gencode.mx 18 Feb 2008 10:52:02 -0000 1.269
+++ sql_gencode.mx 6 Mar 2008 08:33:35 -0000 1.270
@@ -588,7 +588,6 @@
case st_select: {
int l = _dumpstmt(sql, mb, s->op1.stval);
int r = _dumpstmt(sql, mb, s->op2.stval);
- int k;
char *cmd = s->type == st_select ? "select" : "uselect";
@@ -740,29 +739,9 @@
break;
}
case cmp_notequal:{
- int m;
- q = newStmt1(mb, algebraRef, "uselect");
+ q = newStmt1(mb, algebraRef,
"antiuselect");
q = pushArgument(mb, q, l);
q = pushArgument(mb, q, r);
- k = getDestVar(q);
-
- q = newStmt1(mb, algebraRef, "uselect");
- q = pushArgument(mb, q, l);
- q = pushNil(mb, q,
tail_type(s)->type->localtype);
- m = getDestVar(q);
-
- q = newStmt1(mb, algebraRef, "project");
- q = pushArgument(mb, q, l);
- q = pushNil(mb, q, TYPE_void);
- l = getDestVar(q);
- q = newStmt1(mb, algebraRef,
"kdifference");
- q = pushArgument(mb, q, l);
- q = pushArgument(mb, q, k);
- l = getDestVar(q);
-
- q = newStmt1(mb, algebraRef,
"kdifference");
- q = pushArgument(mb, q, l);
- q = pushArgument(mb, q, m);
break;
}
case cmp_lt:
@@ -809,7 +788,8 @@
char *cmd =
(s->type == st_select2) ? selectRef :
- (s->type == st_uselect2) ? uselectRef :
+ (s->type == st_uselect2) ?
+ (s->flag&ANTI ? antiuselectRef : uselectRef) :
joinRef;
/* if st_join2 try to convert to bandjoin */
@@ -862,7 +842,7 @@
q = pushArgument(mb, q, r1);
q = pushArgument(mb, q, r2);
- switch (s->flag) {
+ switch (s->flag&3) {
case 0:
q = pushBit(mb, q, FALSE);
q = pushBit(mb, q, FALSE);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
