Update of /cvsroot/monetdb/MonetDB5/src/optimizer
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19226/src/optimizer
Modified Files:
opt_prelude.mx opt_replicator.mx opt_support.mx
Log Message:
use the new BAT_select interface
added antiuselectRef (needed for sql)
Index: opt_prelude.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_prelude.mx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- opt_prelude.mx 5 Mar 2008 21:51:08 -0000 1.38
+++ opt_prelude.mx 6 Mar 2008 08:36:36 -0000 1.39
@@ -131,6 +131,7 @@
opt_export str unpackRef;
opt_export str updateRef;
opt_export str uselectRef;
+opt_export str antiuselectRef;
opt_export int canBeCrackedProp; /* binary */
opt_export int inlineProp; /* binary */
@@ -266,6 +267,7 @@
str unpackRef;
str updateRef;
str uselectRef;
+str antiuselectRef;
int canBeCrackedProp;
int inlineProp;
@@ -396,6 +398,7 @@
unpackRef = putName("unpack",6);
updateRef = putName("update",6);
uselectRef = putName("uselect",7);
+ antiuselectRef = putName("antiuselect",11);
canBeCrackedProp = PropertyIndex("canBeCracked");
inlineProp = PropertyIndex("inline");
Index: opt_replicator.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_replicator.mx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- opt_replicator.mx 5 Mar 2008 21:51:08 -0000 1.34
+++ opt_replicator.mx 6 Mar 2008 08:36:36 -0000 1.35
@@ -692,7 +692,10 @@
BBPincref(*ret,TRUE);
replstat[rr].reuse++;
} else { /* compute */
- bn = BAT_select_(b, low, hgh, li, hi, tl, FALSE);
+ if (tl)
+ bn = BATselect_(b, low, hgh, li, hi);
+ else
+ bn = BATuselect_(b, low, hgh, li, hi);
if (bn) {
if (!(bn->batDirty&2)) bn =
BATsetaccess(bn, BAT_READ);
*ret = bn->batCacheid;
@@ -718,7 +721,10 @@
replstat[rr].reuse++;
}
else { /* recompute */
- bn = BAT_select_(b, low, hgh, li, hi, tl, FALSE);
+ if (tl)
+ bn = BATselect_(b, low, hgh, li, hi);
+ else
+ bn = BATuselect_(b, low, hgh, li, hi);
if (bn) {
if (!(bn->batDirty&2)) bn =
BATsetaccess(bn, BAT_READ);
*ret = bn->batCacheid;
Index: opt_support.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_support.mx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- opt_support.mx 5 Mar 2008 00:05:04 -0000 1.60
+++ opt_support.mx 6 Mar 2008 08:36:36 -0000 1.61
@@ -1187,6 +1187,7 @@
getFunctionId(p)== selectRef ||
getFunctionId(p)== selectNotNilRef ||
getFunctionId(p)== uselectRef ||
+ getFunctionId(p)== antiuselectRef ||
getFunctionId(p)== likeselectRef ||
getFunctionId(p)== joinRef ||
getFunctionId(p)== semijoinRef ||
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
