Changeset: 1c96e9135bc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c96e9135bc8
Modified Files:
sql/src/backends/monet5/sql.mx
sql/src/server/rel_bin.c
sql/src/server/sql_rel2bin.c
Branch: default
Log Message:
removing more set but unused variables to fix icc compilation
diffs (80 lines):
diff -r 56014c8b6e5d -r 1c96e9135bc8 sql/src/backends/monet5/sql.mx
--- a/sql/src/backends/monet5/sql.mx Tue Dec 07 12:50:33 2010 +0100
+++ b/sql/src/backends/monet5/sql.mx Tue Dec 07 13:21:08 2010 +0100
@@ -1602,12 +1602,11 @@
if (c->def) {
char buf[BUFSIZ];
sql_rel *r = NULL;
- sql_exp *e;
sql->sa = sa_create();
snprintf(buf, BUFSIZ, "select %s;", c->def);
r = rel_parse(sql, buf, m_deps);
- if (!r || !is_project(r->op) || !r->exps ||
list_length(r->exps) != 1 || (e = rel_check_type(sql, &c->type,
r->exps->h->data, type_equal)) == NULL)
+ if (!r || !is_project(r->op) || !r->exps ||
list_length(r->exps) != 1 || rel_check_type(sql, &c->type, r->exps->h->data,
type_equal) == NULL)
throw(SQL, "sql.catalog", sql->errstr);
rel_destroy(r);
sa_destroy(sql->sa);
diff -r 56014c8b6e5d -r 1c96e9135bc8 sql/src/server/rel_bin.c
--- a/sql/src/server/rel_bin.c Tue Dec 07 12:50:33 2010 +0100
+++ b/sql/src/server/rel_bin.c Tue Dec 07 13:21:08 2010 +0100
@@ -2698,11 +2698,9 @@
int len = 0;
node *m, *o;
sql_key *rk = &((sql_fkey*)k)->rkey->k;
- stmt *fts, **new_updates;
+ stmt **new_updates;
sql_table *t = mvc_bind_table(sql, k->t->s, k->t->base.name);
- fts = stmt_basetable(sql->sa, k->idx->t, k->idx->t->base.name);
-
new_updates = table_update_array(t, &len);
for (m = k->idx->columns->h, o = rk->columns->h; m && o; m = m->next, o
= o->next) {
sql_kc *fc = m->data;
@@ -2745,12 +2743,10 @@
int len = 0;
node *m, *o;
sql_key *rk = &((sql_fkey*)k)->rkey->k;
- stmt *fts, **new_updates;
+ stmt **new_updates;
stmt *rows;
sql_table *t = mvc_bind_table(sql, k->t->s, k->t->base.name);
- fts = stmt_basetable(sql->sa, k->idx->t, k->idx->t->base.name);
-
rows = stmt_idxbat(sql->sa, k->idx, RDONLY);
rows = stmt_semijoin(sql->sa, stmt_reverse(sql->sa, rows),
updates[updcol]->op1);
rows = stmt_reverse(sql->sa, rows);
diff -r 56014c8b6e5d -r 1c96e9135bc8 sql/src/server/sql_rel2bin.c
--- a/sql/src/server/sql_rel2bin.c Tue Dec 07 12:50:33 2010 +0100
+++ b/sql/src/server/sql_rel2bin.c Tue Dec 07 13:21:08 2010 +0100
@@ -366,9 +366,6 @@
shrink_select_ranges(mvc *sql, list *oldsels)
{
/* find minimal ranges for selects per column on one table */
- sql_subfunc *min = NULL;
- sql_subfunc *max = NULL;
-
list *newsels, *haveNoBasecol, *haveBasecol, *basecols, *oneColSels,
*twoColSels;
node *bc;
@@ -403,7 +400,7 @@
list_prepend(newsels, s);
else
list_append(newsels, s);
- } else if (tt2 != tt || tt->type->localtype == TYPE_str ||
!(min = sql_bind_func_result(sql->sa, sql->session->schema, "sql_min", tt, tt,
tt)) || !(max = sql_bind_func_result(sql->sa, sql->session->schema, "sql_max",
tt, tt, tt))) {
+ } else if (tt2 != tt || tt->type->localtype == TYPE_str ||
!sql_bind_func_result(sql->sa, sql->session->schema, "sql_min", tt, tt, tt) ||
!sql_bind_func_result(sql->sa, sql->session->schema, "sql_max", tt, tt, tt)) {
/* no "min" and/or "max" available on this data type,
hence, we cannot apply the following "tricks" */
list_merge(newsels, colsels, NULL);
} else {
@@ -1070,9 +1067,8 @@
stmt *res;
node *n;
- list *ol, *l = s->op1->op4.lval;
+ list *l = s->op1->op4.lval;
- ol = l;
assert(list_length(l));
if (list_length(l) == 1) {
res = rel2bin(c, l->h->data);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
