Changeset: 6e6f25c47621 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6e6f25c47621
Modified Files:
sql/backends/monet5/rel_bin.c
sql/include/sql_catalog.h
Branch: default
Log Message:
func->rel is no longer used. Don't cause more confusion
diffs (29 lines):
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
@@ -1294,13 +1294,8 @@ exp_bin(backend *be, sql_exp *e, stmt *l
list_append(l, es);
}
}
- if (f->func->rel) {
- if (!(s = stmt_func(be, stmt_list(be, l),
sa_strdup(sql->sa, f->func->base.name), f->func->rel, (f->func->type ==
F_UNION))))
- return NULL;
- f->func->rel = s->op4.rel; /* f->func->rel may get
rewritten */
- } else if (!(s = stmt_Nop(be, stmt_list(be, l), sel, f))) {
+ if (!(s = stmt_Nop(be, stmt_list(be, l), sel, f)))
return NULL;
- }
} break;
case e_aggr: {
list *attr = e->l;
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -510,7 +510,6 @@ typedef struct sql_func {
*/
sql_schema *s;
sql_allocator *sa;
- void *rel; /* implementation */
} sql_func;
typedef struct sql_subfunc {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
