Changeset: 41d5d1a2ac86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/41d5d1a2ac86
Branch: pp_hashjoin
Log Message:
merged
diffs (96 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
@@ -50458,11 +50458,6 @@ mproject
pattern sort.mproject(X_0:bat[:int], X_1:bat[:any_1],
X_2:bat[:any_1]):bat[:any_1]
PPmproject
(empty)
-sort
-mproject
-pattern sort.mproject(X_0:bat[:int], X_1:bat[:any_1], X_2:bat[:any_1],
X_3:ptr):bat[:any_1]
-PPmproject
-(empty)
source
next
pattern source.next(X_0:bat[:any_2]):bat[:any_1]
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
@@ -38828,11 +38828,6 @@ mproject
pattern sort.mproject(X_0:bat[:int], X_1:bat[:any_1],
X_2:bat[:any_1]):bat[:any_1]
PPmproject
(empty)
-sort
-mproject
-pattern sort.mproject(X_0:bat[:int], X_1:bat[:any_1], X_2:bat[:any_1],
X_3:ptr):bat[:any_1]
-PPmproject
-(empty)
sql
affectedRows
unsafe pattern sql.affectedRows(X_0:int, X_1:lng):int
diff --git a/monetdb5/modules/mal/pp_sort.c b/monetdb5/modules/mal/pp_sort.c
--- a/monetdb5/modules/mal/pp_sort.c
+++ b/monetdb5/modules/mal/pp_sort.c
@@ -864,8 +864,6 @@ static mel_func pp_sort_init_funcs[] = {
arg("desc", bit), arg("nlast", bit))),
pattern("sort", "mproject", PPmproject, false, "", args(1,4,
batargany("r", 1), batarg("zzl", int), batargany("lc",
1), batargany("rc", 1))),
- pattern("sort", "mproject", PPmproject, false, "", args(1,5,
- batargany("r", 1), batarg("zzl", int), batargany("lc",
1), batargany("rc", 1), arg("pipeline", ptr))),
pattern("sop", "new", SOPnew, false, "Create set of (ordered) parts",
args(1,2, batarg("sop", oid), arg("nrworkers", int))),
pattern("sop", "add", SOPadd, false, "add set of bats to the set of (ordered)
parts", args(1,3, batarg("sop", oid), batarg("sop", oid), batvarargany("b",0))),
pattern("sop", "fetch", SOPfetch, false, "fetch a set of bats", args(1,3,
batvarargany("res",0), batarg("tree", oid), arg("pipeline", ptr))),
diff --git a/sql/backends/monet5/rel_orderby.c
b/sql/backends/monet5/rel_orderby.c
--- a/sql/backends/monet5/rel_orderby.c
+++ b/sql/backends/monet5/rel_orderby.c
@@ -254,7 +254,7 @@ rel2bin_orderby(backend *be, sql_rel *re
for (node *en = oexps->h; en; en = en->next, ln = ln->next, rn =
rn->next) {
stmt *lc = ln->data;
stmt *rc = rn->data;
- stmt *mcol = stmt_mproject(be, zzl, lc, rc, 0);
+ stmt *mcol = stmt_mproject(be, zzl, lc, rc);
append(ostmts, mcol);
}
@@ -264,7 +264,7 @@ rel2bin_orderby(backend *be, sql_rel *re
//sql_exp *ce = en->data;
stmt *lc = ln->data; //exp_bin(be, ce, l, NULL, NULL, NULL,
NULL, NULL, 0, 0, 0);
stmt *rc = rn->data; //exp_bin(be, ce, r, NULL, NULL, NULL,
NULL, NULL, 0, 0, 0);
- stmt *mcol = stmt_mproject(be, zzl, lc, rc, 0);
+ stmt *mcol = stmt_mproject(be, zzl, lc, rc);
append(nsub, mcol);
}
sub = stmt_list(be, nsub);
diff --git a/sql/backends/monet5/sql_pp_statement.c
b/sql/backends/monet5/sql_pp_statement.c
--- a/sql/backends/monet5/sql_pp_statement.c
+++ b/sql/backends/monet5/sql_pp_statement.c
@@ -1193,7 +1193,7 @@ stmt_merge(backend *be, stmt *lobc, stmt
}
stmt *
-stmt_mproject(backend *be, stmt *zl, stmt *lc, stmt *rc, int pipeline)
+stmt_mproject(backend *be, stmt *zl, stmt *lc, stmt *rc)
{
if (zl == NULL || lc == NULL || rc == NULL)
return NULL;
@@ -1202,8 +1202,6 @@ stmt_mproject(backend *be, stmt *zl, stm
pushArgument(be->mb, q, zl->nr);
pushArgument(be->mb, q, lc->nr);
pushArgument(be->mb, q, rc->nr);
- if (pipeline)
- pushArgument(be->mb, q, pipeline);
pushInstruction(be->mb, q);
if (q) {
stmt *s = stmt_create(be->mvc->sa, st_join);
diff --git a/sql/backends/monet5/sql_pp_statement.h
b/sql/backends/monet5/sql_pp_statement.h
--- a/sql/backends/monet5/sql_pp_statement.h
+++ b/sql/backends/monet5/sql_pp_statement.h
@@ -58,7 +58,7 @@ extern int stmt_pp_end(backend *ba, stmt
sql_export void pp_cleanup(backend *ba, int var); /* register to be cleanup
variables at end of pipeline block */
extern stmt *stmt_merge(backend *be, stmt *lobc, stmt *robc, bool asc, bool
nlast, stmt *zl, stmt *zb, stmt *za);
-extern stmt *stmt_mproject(backend *be, stmt *zl, stmt *lc, stmt *rc, int
pipeline);
+extern stmt *stmt_mproject(backend *be, stmt *zl, stmt *lc, stmt *rc);
extern stmt *stmt_pp_alias(backend *be, InstrPtr q, sql_exp *e, int colnr);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
