Changeset: c826355d4b76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c826355d4b76
Modified Files:
sql/backends/monet5/bin_partition_by_slice.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_pp_statement.c
Branch: pp_hashjoin
Log Message:
removed commented-out code and use the predefined <...>Ref
diffs (59 lines):
diff --git a/sql/backends/monet5/bin_partition_by_slice.c
b/sql/backends/monet5/bin_partition_by_slice.c
--- a/sql/backends/monet5/bin_partition_by_slice.c
+++ b/sql/backends/monet5/bin_partition_by_slice.c
@@ -621,7 +621,6 @@ rel_groupby_combine_pp(backend *be, sql_
it = first_arg_subtype(e);
if (avg && EC_APPNUM(tpe->type->eclass) && it
&& !EC_APPNUM(it->type->eclass))
tpe = it;
- //q = newStmt(be->mb, getName("aggr"),
getName(name));
q = newStmt(be->mb, ilockedaggrRef,
getName(name));
if (avg || sum) { /* remainder (or
compensation) and count */
m = m->next;
@@ -636,7 +635,6 @@ rel_groupby_combine_pp(backend *be, sql_
q = pushArgument(be->mb, q,
getArg(i->q, 1));
q = pushArgument(be->mb, q,
getArg(i->q, 2));
}
- //q = pushArgument(be->mb, q, getArg(pp->q, 2));
q = pushArgument(be->mb, q, grp->nr);
} else {
q = newStmt(be->mb, ialgebraRef, projectionRef);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1971,7 +1971,6 @@ exp_bin(backend *be, sql_exp *e, stmt *l
}
s = stmt_aggr(be, as, grp, ext, a, 1, need_no_nil(e) /* ignore
nil*/, !zero_if_empty(e));
if (pipeline) { /* pipeline grouping with groups */
- //s->q = pushArgument(be->mb, s->q, pipeline);
s->q = pushArgument(be->mb, s->q, ogrp);
s->q->inout = 0;
s->nrcols = 1;
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
@@ -92,7 +92,7 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
strcmp(aggrfunc, "sum") == 0 ||
strcmp(aggrfunc, "prod") == 0 ||
strcmp(aggrfunc, "null") == 0 )) /*
incremental versions TODO do for other aggr functions */
- mod = putName("iaggr");
+ mod = iaggrRef;
if (avg || strcmp(aggrfunc, "sum") == 0 || strcmp(aggrfunc,
"prod") == 0
|| strcmp(aggrfunc, "str_group_concat") == 0)
@@ -109,7 +109,7 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
if (grp) {
if ((grp && grp->nr < 0) || (ext && ext->nr < 0))
return NULL;
- mod = putName("ilockedaggr");
+ mod = ilockedaggrRef;
q = newStmtArgs(mb, mod, aggrfunc, argc);
if (q == NULL)
return NULL;
@@ -854,7 +854,6 @@ pipeline_start(backend *be, int nrparts,
q = pushReturn(be->mb, q, newTmpVariable(be->mb, TYPE_int));
q = pushReturn(be->mb, q, newTmpVariable(be->mb, TYPE_ptr));
if (sink > 0) { /* TODO handle case for both a sink and input/nrparts */
- // assert(0);
q = pushArgument(be->mb, q, sink);
} else if (input >= 0 && nrparts == 0) {
assert(0);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
