Changeset: 83760ec92572 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/83760ec92572
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/mal/pp_algebra.c
Branch: pp_hashjoin
Log Message:
removed lockedalgebra.projection which is no longer used.
This function only had a dummy implementation, and in changeset 72027a052283, it
was replaced by algebra.projection with a real implementation.
diffs (60 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
@@ -48088,11 +48088,6 @@ sum_no_nil
unsafe pattern lockedaggr.sum_no_nil(X_0:any_1):bat[:any_1]
LOCKEDAGGRsum_no_nil1
sum values into bat (bat has value, update), using the bat lock
-lockedalgebra
-projection
-command lockedalgebra.projection(X_0:ptr, X_1:bat[:oid],
X_2:bat[:any_1]):bat[:any_1]
-LALGprojection
-Project left input onto right input.
lockedgroup
group
command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:lng])
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
@@ -36463,11 +36463,6 @@ sum
unsafe pattern lockedaggr.sum(X_0:any_1):bat[:any_1]
LOCKEDAGGRsum1
sum values into bat (bat has value, update), using the bat lock
-lockedalgebra
-projection
-command lockedalgebra.projection(X_0:ptr, X_1:bat[:oid],
X_2:bat[:any_1]):bat[:any_1]
-LALGprojection
-Project left input onto right input.
lockedgroup
group
command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:lng])
diff --git a/monetdb5/modules/mal/pp_algebra.c
b/monetdb5/modules/mal/pp_algebra.c
--- a/monetdb5/modules/mal/pp_algebra.c
+++ b/monetdb5/modules/mal/pp_algebra.c
@@ -918,18 +918,6 @@ LOCKEDAGGRnull(Client ctx, bat *result,
return err;
}
-static str
-LALGprojection(Client ctx, bat *result, const ptr *h, const bat *lid, const
bat *rid)
-{
- Pipeline *p = (Pipeline*)*h;
- str res;
-
- pipeline_lock(p);
- res = ALGprojection(ctx, result, lid, rid);
- pipeline_unlock(p);
- return res;
-}
-
#define unique_(Type, BaseType, INIT_ALLOCATOR, INIT_ITER, NEW_VAL, HASH_VAL,
VAL_NOT_EQUAL, VAL_ASSIGN, ITER_NEXT, NEXTK) \
if (tt == TYPE_##Type) { \
int slots = 0; \
@@ -4934,7 +4922,6 @@ static mel_func pp_algebra_init_funcs[]
pattern("lockedaggr", "min", LOCKEDAGGRmin, true, "min values into bat (bat
has value, update), using the bat lock", args(1,2, sharedbatargany("", 1),
argany("val", 1))),
pattern("lockedaggr", "max", LOCKEDAGGRmax, true, "max values into bat (bat
has value, update), using the bat lock", args(1,2, sharedbatargany("", 1),
argany("val", 1))),
command("lockedaggr", "null", LOCKEDAGGRnull, true, "Returns true or false if
the input contains a NULL or not, nil if the input is empty..", args(1,2,
sharedbatarg("",bit),arg("hadnull",bit))),
- command("lockedalgebra", "projection", LALGprojection, false, "Project left
input onto right input.", args(1,4, batargany("",1), arg("pipeline", ptr),
batarg("left",oid),batargany("right",1))),
command("algebra", "unique", LALGunique, false, "Unique rows.", args(2,5,
batarg("gid", oid), batargany("",1), arg("pipeline", ptr), batargany("b",1),
batarg("s",oid))),
command("algebra", "unique", LALGgroup_unique, false, "Unique per group
rows.", args(2,6, batarg("ngid", oid), batargany("",1), arg("pipeline", ptr),
batargany("b",1), batarg("s",oid), batarg("gid",oid))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
