Changeset: d7fca7dc4a50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d7fca7dc4a50
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/kernel/algebra.c
Branch: Dec2023
Log Message:
Removed unused version of algebra.markjoin.
diffs (133 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3504,11 +3504,6 @@ command algebra.markjoin(X_0:bat[:any_1]
ALGmark3join;
Mark join with candidate lists
algebra
-markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
-ALGmarkjoin;
-Left mark join with candidate lists, produces left output and mark flag;
-algebra
markselect
command algebra.markselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGmarkselect;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2939,11 +2939,6 @@ command algebra.markjoin(X_0:bat[:any_1]
ALGmark3join;
Mark join with candidate lists
algebra
-markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
-ALGmarkjoin;
-Left mark join with candidate lists, produces left output and mark flag;
-algebra
markselect
command algebra.markselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGmarkselect;
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -799,91 +799,6 @@ ALGleftjoin1(bat *r1, const bat *lid, co
"algebra.leftjoin");
}
-#include <gdk_subquery.h>
-static str ALGcrossproduct2(bat *l, bat *r, const bat *left, const bat *right,
const bit *max_one);
-static str
-ALGmarkjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid,
const bat *srid,
- const bit *any, const lng *estimate)
-{
- str res = NULL;
- bit max_one = false;
- *r1 = *r2 = 0;
- (void)any;
- (void)estimate;
- /* for now: (left) cross aggr (any-equal) */
- BAT *rr = BATdescriptor(is_bat_nil(*srid)?*rid:*srid);
- if (!BATcount(rr)) {
- BAT *l = NULL;
- if (is_bat_nil(*slid)) {
- BAT *lp = BATdescriptor(*lid);
-
- if (lp) {
- l = BATdense(lp->hseqbase, lp->hseqbase,
BATcount(lp));
- BBPunfix(lp->batCacheid);
- }
- } else {
- l = BATdescriptor(*slid);
- }
- bit v = false;//*any?false:true;
- BAT *m = BATconstant( l->hseqbase, TYPE_bit, &v, BATcount(l),
TRANSIENT);
- BBPkeepref(l);
- BBPkeepref(m);
- *r1 = l->batCacheid;
- *r2 = m->batCacheid;
- BBPunfix(rr->batCacheid);
- return MAL_SUCCEED;
- }
- BBPunfix(rr->batCacheid);
- if ((res = ALGcrossproduct2(r1, r2, is_bat_nil(*slid)?lid:slid,
(*srid)?rid:srid, &max_one)) == MAL_SUCCEED) {
- BAT *li = BATdescriptor(*r1), *g = NULL, *e = NULL;
- if (!li) {
- BBPrelease(*r1);
- BBPrelease(*r2);
- throw(MAL, "algebra.markjoin", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
- if (BATgroup(&g, &e, NULL, li, NULL, NULL, NULL, NULL) ==
GDK_SUCCEED) {
- BAT *lp = BATdescriptor(*lid);
- BAT *l = BATproject( li, lp);
- BBPreclaim(lp);
-
- BAT *ri = BATdescriptor(*r2);
- BAT *rp = BATdescriptor(*rid);
- BAT *r = BATproject( ri, rp);
- BBPreclaim(ri);
- BBPreclaim(rp);
- BAT *m;
-
- //if (*any)
- m = BATanyequal_grp(l, r, g, e, NULL);
- /*
- else
- m = BATallnotequal_grp(l, r, g, e, NULL);
- */
-
- BBPreclaim(l);
- BBPreclaim(r);
- BBPreclaim(g);
- l = BATproject(e,li);
- BBPreclaim(e);
- BBPreclaim(li);
-
- BBPkeepref(l);
- BBPkeepref(m);
- BBPrelease(*r1);
- BBPrelease(*r2);
- *r1 = l->batCacheid;
- *r2 = m->batCacheid;
- return MAL_SUCCEED;
- } else {
- BBPreclaim(li);
- BBPrelease(*r1);
- BBPrelease(*r2);
- res = GDKstrdup("error\n");
- }
- }
- return res;
-}
-
static str
ALGouterjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid,
const bat *srid, const bit *nil_matches, const bit
*match_one,
@@ -1893,7 +1808,6 @@ mel_func algebra_init_funcs[] = {
command("algebra", "join", ALGjoin1, false, "Join; only produce left output",
args(1,7,
batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng))),
command("algebra", "leftjoin", ALGleftjoin, false, "Left join with candidate
lists", args(2,8,
batarg("",oid),batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng))),
command("algebra", "leftjoin", ALGleftjoin1, false, "Left join with candidate
lists; only produce left output", args(1,7,
batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng))),
- command("algebra", "markjoin", ALGmarkjoin, false, "Left mark join with
candidate lists, produces left output and mark flag; ", args(2,8,
batarg("",oid), batarg("", bit),
batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("estimate",lng))),
command("algebra", "outerjoin", ALGouterjoin, false, "Left outer join with
candidate lists", args(2,9,
batarg("",oid),batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("match_one",bit),arg("estimate",lng))),
command("algebra", "outerjoin", ALGouterjoin1, false, "Left outer join with
candidate lists; only produce left output",
args(1,8,batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("match_one",bit),arg("estimate",lng))),
command("algebra", "semijoin", ALGsemijoin, false, "Semi join with candidate
lists", args(2,9,
batarg("",oid),batarg("",oid),batargany("l",1),batargany("r",1),batarg("sl",oid),batarg("sr",oid),arg("nil_matches",bit),arg("max_one",bit),arg("estimate",lng))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
