Changeset: 24ea9a2d8234 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/24ea9a2d8234
Modified Files:
sql/backends/monet5/sql_pp_statement.c
Branch: pp_hashjoin
Log Message:
small clean up: removed code that might have been accidentally copy-pasted; and
code that has been commented out long ago
diffs (29 lines):
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
@@ -83,16 +83,6 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
if (sum && restype != TYPE_dbl && restype != TYPE_flt)
sum = 0;
-
- if (op1->type == st_list) {
- stmt *s = op1->op4.lval->h->data;
- intype = tail_type(s)->type->localtype;
- } else {
- intype = tail_type(op1)->type->localtype;
- }
- if (avg && restype == TYPE_dbl && intype != TYPE_dbl && intype
!= TYPE_flt)
- restype = intype;
-
/* For the single value aggregates, we use the incremental
* aggr. functions from the module 'iaggr' */
if (!grp && (strcmp(aggrfunc, "count") == 0 ||
@@ -100,8 +90,6 @@ stmt_pp_aggr(backend *be, stmt *op1, stm
strcmp(aggrfunc, "max") == 0 ||
strcmp(aggrfunc, "null") == 0 )) /*
incremental versions TODO do for other aggr functions */
mod = putName("iaggr");
- //else if (!grp && avg && restype == TYPE_dbl)
- //mod = putName("batcalc");
if (avg || strcmp(aggrfunc, "sum") == 0 || strcmp(aggrfunc,
"prod") == 0
|| strcmp(aggrfunc, "str_group_concat") == 0)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
