Changeset: 88d052c47a68 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88d052c47a68
Modified Files:
monetdb5/modules/kernel/algebra.mx
Branch: Dec2011
Log Message:
Cleanup: get rid of the middle man.
diffs (27 lines):
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -1529,12 +1529,6 @@ CMDfragment(BAT **result, BAT *b, ptr hl
}
static int
-CMDthetajoin(BAT **result, BAT *left, BAT *right, int *mode, lng *estimate)
-{
- return (*result = BATthetajoin(left, right, *mode, *estimate == lng_nil
|| *estimate < 0 ? BUN_NONE : (*estimate >= (lng) BUN_MAX ? BUN_MAX : (BUN)
*estimate))) ? GDK_SUCCEED : GDK_FAIL;
-}
-
-static 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;
@@ -2609,8 +2603,8 @@ ALGthetajoinEstimate(int *result, int *l
BBPreleaseref(left->batCacheid);
BBPreleaseref(right->batCacheid);
throw(MAL, "algebra.thetajoin", ILLEGAL_ARGUMENT " Theta
comparison <> not yet supported");
- }
- CMDthetajoin(&bn, left, right, opc, estimate);
+ }
+ bn = BATthetajoin(left, right, *opc, *estimate == lng_nil || *estimate
< 0 ? BUN_NONE : (*estimate >= (lng) BUN_MAX ? BUN_MAX : (BUN) *estimate));
if (bn) {
if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ);
*result = bn->batCacheid;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
