Changeset: 9d2795173063 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9d2795173063
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_select.c
sql/server/rel_unnest.c
Branch: default
Log Message:
cleanup
diffs (47 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
@@ -339,7 +339,7 @@ static stmt *
bin_find_smallest_column(backend *be, stmt *sub)
{
stmt *res = sub->op4.lval->h->data;
- int best_score = statment_score(sub->op4.lval->h->data);
+ int best_score = statment_score(res);
if (sub->op4.lval->h->next)
for (node *n = sub->op4.lval->h->next ; n ; n = n->next) {
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -935,8 +935,7 @@ rel_named_table_function(sql_query *quer
append(tl, exp_subtype(e));
}
} else {
- for (node *en = exps->h; en; en = en->next)
- append(tl, exp_subtype(en->data));
+ tl = exp_types(sql->sa, exps);
}
}
@@ -2332,8 +2331,7 @@ rel_in_value_exp(sql_query *query, sql_r
int is_tuple = 0, add_select = 0;
/* complex case */
- //if (dl->h->type == type_list) { /* (a,b..) in (.. ) */
- if (dl->h->type == type_symbol && dl->h->data.sym->token == SQL_VALUES)
{
+ if (dl->h->type == type_symbol && dl->h->data.sym->token == SQL_VALUES)
{ /* (a,b..) in (.. ) */
lo = dl->h->data.sym;
dn = lo->data.lval->h->data.lval->h;
lo = dn->data.sym;
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -491,7 +491,7 @@ rel_dependent_var(mvc *sql, sql_rel *l,
list *freevar = rel_freevar(sql, r, l);
if (freevar) {
node *n;
- list *boundvar = rel_projections(sql, l, NULL, 1, 0);
+ list *boundvar = rel_projections(sql,
l, NULL, 1, 0);
for(n = freevar->h; n; n = n->next) {
sql_exp *e = n->data, *ne = NULL;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
