Changeset: b59ade645a72 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b59ade645a72 Modified Files: sql/server/rel_rel.c Branch: default Log Message:
Adding missing License & Copyright header Also removed some trailing spaces diffs (163 lines): 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 @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ #include "monetdb_config.h" #include "rel_rel.h" @@ -199,7 +206,7 @@ rel_bind_column_(mvc *sql, sql_rel **p, return NULL; } } - if (sql->session->status == -ERR_AMBIGUOUS) + if (sql->session->status == -ERR_AMBIGUOUS) return NULL; if (l && !r) return l; @@ -284,7 +291,7 @@ rel_bind_column2( mvc *sql, sql_rel *rel } else if (is_set(rel->op) || is_sort(rel) || is_semi(rel->op) || - is_select(rel->op) || + is_select(rel->op) || is_topn(rel->op)) { if (rel->l) return rel_bind_column2(sql, rel->l, tname, cname, f); @@ -356,7 +363,7 @@ rel_inplace_groupby(sql_rel *rel, sql_re { rel_destroy_(rel); rel->card = CARD_ATOM; - if (groupbyexps) + if (groupbyexps) rel->card = CARD_AGGR; rel->l = l; rel->r = groupbyexps; @@ -385,7 +392,7 @@ rel_setop(sql_allocator *sa, sql_rel *l, } sql_rel * -rel_setop_check_types(mvc *sql, sql_rel *l, sql_rel *r, list *ls, list *rs, operator_type op) +rel_setop_check_types(mvc *sql, sql_rel *l, sql_rel *r, list *ls, list *rs, operator_type op) { list *nls = new_exp_list(sql->sa); list *nrs = new_exp_list(sql->sa); @@ -682,7 +689,7 @@ rel_basetable(mvc *sql, sql_table *t, co return NULL; } - if (isRemote(t)) + if (isRemote(t)) tname = mapiuri_table(t->query, sql->sa, tname); for (cn = t->columns.set->h; cn; cn = cn->next) { sql_column *c = cn->data; @@ -711,7 +718,7 @@ rel_basetable(mvc *sql, sql_table *t, co continue; if (i->type == join_idx) - t = sql_bind_localtype("oid"); + t = sql_bind_localtype("oid"); iname = sa_strconcat( sa, "%", i->base.name); e = exp_alias(sa, atname, iname, tname, iname, t, CARD_MULTI, 0, 1); @@ -752,8 +759,8 @@ rel_groupby(mvc *sql, sql_rel *l, list * for (en = groupbyexps->h; en; en = en->next) { sql_exp *e = en->data, *ne; - if ((ne=exps_find_exp(gexps, e)) == NULL || - strcmp(exp_relname(e),exp_relname(ne)) != 0 || + if ((ne=exps_find_exp(gexps, e)) == NULL || + strcmp(exp_relname(e),exp_relname(ne)) != 0 || strcmp(exp_name(e),exp_name(ne)) != 0 ) append(gexps, e); } @@ -1042,7 +1049,7 @@ rel_push_select(mvc *sql, sql_rel *rel, break; p = lrel; } - if (!lrel) + if (!lrel) return NULL; if (p && p->op == op_select && !rel_is_ref(p)) { /* refine old select */ rel_select_add_exp(sql->sa, p, e); @@ -1074,13 +1081,13 @@ rel_push_join(mvc *sql, sql_rel *rel, sq { list *l = rel_bind_path(sql->sa, rel, ls); list *r = rel_bind_path(sql->sa, rel, rs); - list *r2 = NULL; + list *r2 = NULL; node *ln, *rn; sql_rel *lrel = NULL, *rrel = NULL, *rrel2 = NULL, *p = NULL; if (rs2) r2 = rel_bind_path(sql->sa, rel, rs2); - if (!l || !r || (rs2 && !r2)) + if (!l || !r || (rs2 && !r2)) return NULL; if (!sql->pushdown) @@ -1100,7 +1107,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq /* push down as long as the operators allow this and the relation is equal. - */ + */ if (lrel != rrel || lrel != rrel2 || (!is_select(lrel->op) && !(is_semi(lrel->op) && !rel_is_ref(lrel->l)) && @@ -1122,7 +1129,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq /* push down as long as the operators allow this and the relation is equal. - */ + */ if (lrel != rrel || (!is_select(lrel->op) && !(is_semi(lrel->op) && !rel_is_ref(lrel->l)) && @@ -1172,11 +1179,11 @@ rel_or(mvc *sql, sql_rel *rel, sql_rel * assert(!lexps || l == r); if (l == r && lexps) { /* merge both lists */ sql_exp *e = exp_or(sql->sa, lexps, rexps, 0); - list *nl = oexps?oexps:new_exp_list(sql->sa); + list *nl = oexps?oexps:new_exp_list(sql->sa); rel_destroy(r); append(nl, e); - if (is_outerjoin(l->op) && is_processed(l)) + if (is_outerjoin(l->op) && is_processed(l)) l = rel_select(sql->sa, l, NULL); l->exps = nl; return l; @@ -1186,7 +1193,7 @@ rel_or(mvc *sql, sql_rel *rel, sql_rel * if (l->op == r->op && l->op == op_select && ll == rl && ll == rel && !rel_is_ref(l) && !rel_is_ref(r)) { sql_exp *e = exp_or(sql->sa, l->exps, r->exps, 0); - list *nl = new_exp_list(sql->sa); + list *nl = new_exp_list(sql->sa); rel_destroy(r); append(nl, e); @@ -1243,7 +1250,7 @@ rel_ddl_table_get(sql_rel *r) } static sql_exp * -exps_find_identity(list *exps) +exps_find_identity(list *exps) { node *n; @@ -1279,7 +1286,7 @@ static sql_rel * sql_rel * rel_add_identity(mvc *sql, sql_rel *rel, sql_exp **exp) { - if (rel && is_project(rel->op) && (*exp = exps_find_identity(rel->exps)) != NULL) + if (rel && is_project(rel->op) && (*exp = exps_find_identity(rel->exps)) != NULL) return rel; return _rel_add_identity(sql, rel, exp); } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
