Changeset: 3d364f123f3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d364f123f3c
Modified Files:
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_rel.h
Branch: default
Log Message:
Removed unused macros
diffs (76 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -551,14 +551,14 @@ matching_joins(sql_allocator *sa, list *
r = find_rel(rels, je->r);
if (l && r) {
list *res;
- list *n_rels = new_rel_list(sa);
+ list *n_rels = sa_list(sa);
append(n_rels, l);
append(n_rels, r);
res = list_select(exps, n_rels, (fcmp) &exp_joins_rels,
(fdup)NULL);
return res;
}
- return new_rel_list(sa);
+ return sa_list(sa);
}
static int
@@ -840,7 +840,7 @@ order_joins(mvc *sql, list *rels, list *
sql_rel *top = NULL, *l = NULL, *r = NULL;
sql_exp *cje;
node *djn;
- list *sdje, *n_rels = new_rel_list(sql->sa);
+ list *sdje, *n_rels = sa_list(sql->sa);
int fnd = 0;
/* find foreign keys and reorder the expressions on reducing quality */
@@ -1112,7 +1112,7 @@ reorder_join(mvc *sql, sql_rel *rel)
if (!exps) /* crosstable, ie order not important */
return rel;
rel->exps = NULL; /* should be all crosstables by now */
- rels = new_rel_list(sql->sa);
+ rels = sa_list(sql->sa);
if (is_outerjoin(rel->op)) {
sql_rel *l, *r;
int cnt = 0;
@@ -8165,7 +8165,7 @@ rel_semijoin_use_fk(int *changes, mvc *s
(void)changes;
if (is_semi(rel->op) && rel->exps) {
list *exps = rel->exps;
- list *rels = new_rel_list(sql->sa);
+ list *rels = sa_list(sql->sa);
rel->exps = NULL;
append(rels, rel->l);
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1164,10 +1164,9 @@ rel_bind_path_(mvc *sql, sql_rel *rel, s
static list *
rel_bind_path(mvc *sql, sql_rel *rel, sql_exp *e)
{
- list *path = new_rel_list(sql->sa);
- if(!path) {
+ list *path = sa_list(sql->sa);
+ if (!path)
return NULL;
- }
if (e->type == e_convert)
e = e->l;
diff --git a/sql/server/rel_rel.h b/sql/server/rel_rel.h
--- a/sql/server/rel_rel.h
+++ b/sql/server/rel_rel.h
@@ -39,9 +39,6 @@
#define is_sql_outer(X) ((X & sql_outer) == sql_outer)
#define is_sql_group_totals(X) ((X & sql_group_totals) == sql_group_totals)
-#define rel_groupby_gbe(m,r,e) rel_groupby(m, r, append(new_exp_list(m->sa),
e))
-#define new_rel_list(sa) sa_list(sa)
-
#define is_updateble(rel) \
(rel->op == op_basetable || \
(rel->op == op_ddl && (rel->flag == ddl_create_table || rel->flag ==
ddl_alter_table)))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
