Changeset: cc88fd097f9c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc88fd097f9c Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal Branch: Oct2020 Log Message:
Change algebra.projection2 to algebra.projection. It can be distinguished from the already existing algebra.projection by the extra argument. diffs (50 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -647,8 +647,8 @@ stdout of test 'MAL-signatures` in direc [ "algebra", "outerjoin", "command algebra.outerjoin(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng):bat[:oid] ", "ALGouterjoin1;", "" ] [ "algebra", "outerjoin", "command algebra.outerjoin(X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:oid], X_5:bat[:oid], X_6:bit, X_7:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGouterjoin;", "" ] [ "algebra", "project", "pattern algebra.project(X_1:bat[:any_1], X_2:any_3):bat[:any_3] ", "ALGprojecttail;", "" ] +[ "algebra", "projection", "command algebra.projection(X_1:bat[:oid], X_2:bat[:any_3], X_3:bat[:any_3]):bat[:any_3] ", "ALGprojection2;", "" ] [ "algebra", "projection", "command algebra.projection(X_1:bat[:oid], X_2:bat[:any_3]):bat[:any_3] ", "ALGprojection;", "" ] -[ "algebra", "projection2", "command algebra.projection2(X_1:bat[:oid], X_2:bat[:any_3], X_3:bat[:any_3]):bat[:any_3] ", "ALGprojection2;", "" ] [ "algebra", "projectionpath", "pattern algebra.projectionpath(X_1:bat[:any]...):bat[:any] ", "ALGprojectionpath;", "" ] [ "algebra", "rangejoin", "command algebra.rangejoin(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:oid], X_5:bat[:oid], X_6:bit, X_7:bit, X_8:bit, X_9:bit, X_10:lng):bat[:oid] ", "ALGrangejoin1;", "" ] [ "algebra", "rangejoin", "command algebra.rangejoin(X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:any_1], X_5:bat[:oid], X_6:bat[:oid], X_7:bit, X_8:bit, X_9:bit, X_10:bit, X_11:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGrangejoin;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -760,8 +760,8 @@ stdout of test 'MAL-signatures` in direc [ "algebra", "outerjoin", "command algebra.outerjoin(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng):bat[:oid] ", "ALGouterjoin1;", "" ] [ "algebra", "outerjoin", "command algebra.outerjoin(X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:oid], X_5:bat[:oid], X_6:bit, X_7:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGouterjoin;", "" ] [ "algebra", "project", "pattern algebra.project(X_1:bat[:any_1], X_2:any_3):bat[:any_3] ", "ALGprojecttail;", "" ] +[ "algebra", "projection", "command algebra.projection(X_1:bat[:oid], X_2:bat[:any_3], X_3:bat[:any_3]):bat[:any_3] ", "ALGprojection2;", "" ] [ "algebra", "projection", "command algebra.projection(X_1:bat[:oid], X_2:bat[:any_3]):bat[:any_3] ", "ALGprojection;", "" ] -[ "algebra", "projection2", "command algebra.projection2(X_1:bat[:oid], X_2:bat[:any_3], X_3:bat[:any_3]):bat[:any_3] ", "ALGprojection2;", "" ] [ "algebra", "projectionpath", "pattern algebra.projectionpath(X_1:bat[:any]...):bat[:any] ", "ALGprojectionpath;", "" ] [ "algebra", "rangejoin", "command algebra.rangejoin(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:oid], X_5:bat[:oid], X_6:bit, X_7:bit, X_8:bit, X_9:bit, X_10:lng):bat[:oid] ", "ALGrangejoin1;", "" ] [ "algebra", "rangejoin", "command algebra.rangejoin(X_2:bat[:any_1], X_3:bat[:any_1], X_4:bat[:any_1], X_5:bat[:oid], X_6:bat[:oid], X_7:bit, X_8:bit, X_9:bit, X_10:bit, X_11:lng) (X_0:bat[:oid], X_1:bat[:oid]) ", "ALGrangejoin;", "" ] 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 @@ -1449,7 +1449,7 @@ mel_func algebra_init_funcs[] = { command("algebra", "fetch", ALGfetchoid, false, "Returns the value of the BUN at x-th position with 0 <= x < b.count", args(1,3, argany("",1),batargany("b",1),arg("x",oid))), pattern("algebra", "project", ALGprojecttail, false, "Fill the tail with a constant", args(1,3, batargany("",3),batargany("b",1),argany("v",3))), command("algebra", "projection", ALGprojection, false, "Project left input onto right input.", args(1,3, batargany("",3),batarg("left",oid),batargany("right",3))), - command("algebra", "projection2", ALGprojection2, false, "Project left input onto right inputs which should be consecutive.", args(1,4, batargany("",3),batarg("left",oid),batargany("right1",3),batargany("right2",3))), + command("algebra", "projection", ALGprojection2, false, "Project left input onto right inputs which should be consecutive.", args(1,4, batargany("",3),batarg("left",oid),batargany("right1",3),batargany("right2",3))), command("algebra", "copy", ALGcopy, false, "Returns physical copy of a BAT.", args(1,2, batargany("",1),batargany("b",1))), command("algebra", "exist", ALGexist, false, "Returns whether 'val' occurs in b.", args(1,3, arg("",bit),batargany("b",1),argany("val",1))), command("algebra", "select", ALGselect1, false, "Select all head values for which the tail value is in range.\nInput is a dense-headed BAT, output is a dense-headed BAT with in\nthe tail the head value of the input BAT for which the tail value\nis between the values low and high (inclusive if li respectively\nhi is set). The output BAT is sorted on the tail value. If low\nor high is nil, the boundary is not considered (effectively - and\n+ infinity). If anti is set, the result is the complement. Nil\nvalues in the tail are never matched, unless low=nil, high=nil,\nli=1, hi=1, anti=0. All non-nil values are returned if low=nil,\nhigh=nil, and li, hi are not both 1, or anti=1.\nNote that the output is suitable as second input for the other\nversion of this function.", args(1,7, batarg("",oid),batargany("b",1),argany("low",1),argany("high",1),arg("li",bit),arg("hi",bit),arg("anti",bit))), diff --git a/monetdb5/modules/kernel/algebra.mal b/monetdb5/modules/kernel/algebra.mal --- a/monetdb5/modules/kernel/algebra.mal +++ b/monetdb5/modules/kernel/algebra.mal @@ -27,7 +27,7 @@ command projection( left:bat[:oid], righ address ALGprojection comment "Project left input onto right input."; -command projection2( left:bat[:oid], right1:bat[:any_3], right2:bat[:any_3] ) :bat[:any_3] +command projection( left:bat[:oid], right1:bat[:any_3], right2:bat[:any_3] ) :bat[:any_3] address ALGprojection2 comment "Project left input onto right inputs which should be consecutive."; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list