Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8673/src/modules/plain
Modified Files:
algebra.mx str.mx
Log Message:
added wrappers for new bandjoin api
Index: str.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/str.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- str.mx 18 Dec 2007 20:56:44 -0000 1.6
+++ str.mx 30 Dec 2007 18:05:01 -0000 1.7
@@ -2081,6 +2081,5 @@
*Res = res;
return GDK_SUCCEED;
}
-
@
@}
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/algebra.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- algebra.mx 21 Dec 2007 15:13:56 -0000 1.7
+++ algebra.mx 30 Dec 2007 18:05:01 -0000 1.8
@@ -381,12 +381,21 @@
.COMMAND bandjoin ( BAT[any::1,any::2] outer,
BAT[any::2,any::3] inner,
any::2 minus, any::2 plus) :
- BAT[any::1,any::3] = CMDbandjoin;
+ BAT[any::1,any::3] = CMDbandjoin_default;
"This is a join() for which the predicate is that two BUNs match if
the left-tail value is within the range [right-head - minus,
right-head + plus]\n
Works only for the builtin numerical types, and their derivates."
+.COMMAND bandjoin ( BAT[any::1,any::2] outer,
+ BAT[any::2,any::3] inner,
+ any::2 minus, any::2 plus, bit l_in, bit h_in) :
+ BAT[any::1,any::3] = CMDbandjoin;
+"This is a join() for which the predicate is that two BUNs match if
+the left-tail value is within the range [right-head - minus,
+right-head + plus], depending on (l_in/h_in), the bounds are included.\n
+Works only for the builtin numerical types, and their derivates."
+
.COMMAND join ( BAT[any::1,any::2] l,
BAT[any::3,any::2] rl,
BAT[any::3,any::2] rh, bit l_in, bit h_in) :
@@ -1703,9 +1712,15 @@
}
int
-CMDbandjoin(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus)
+CMDbandjoin_default(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus)
{
- return (*result = BATbandjoin(left, right, minus, plus)) ? GDK_SUCCEED
: GDK_FAIL;
+ return (*result = BATbandjoin(left, right, minus, plus, TRUE, TRUE)) ?
GDK_SUCCEED : GDK_FAIL;
+}
+
+int
+CMDbandjoin(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li,
bit *hi)
+{
+ return (*result = BATbandjoin(left, right, minus, plus, *li, *hi)) ?
GDK_SUCCEED : GDK_FAIL;
}
int
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
