MonetDB: sciql - also check it is indeed an e_column and correct...

[Jennie Zhang]

Changeset: bf07df5b5677 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf07df5b5677
Modified Files:
        sql/server/rel_select.c
Branch: sciql
Log Message:

also check it is indeed an e_column and correct a simple mistake


diffs (21 lines):

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
@@ -453,7 +453,7 @@ rel_arrayslice(mvc *sql, sql_table *t, c
 
        assert(dimref->token == SQL_ARRAY_DIM_SLICE);
 
-       if (t->ndims)
+       if (!t->ndims)
                return sql_error(sql, 02, "array slicing over a table ('%s')not 
allowed", t->base.name);
 
        /* Handling array slicing using normal SQL: WHERE <pred_exp> IN '(' 
<value_commalist> ')'.
@@ -4092,7 +4092,7 @@ _rel_aggr(mvc *sql, sql_rel **rel, int d
                return e;
        }
 
-       if (groupby->r && ((list*)groupby->r)->h && 
((sql_exp*)((list*)groupby->r)->h->data)->f) {
+       if (groupby->r && ((list*)groupby->r)->h && 
((sql_exp*)((list*)groupby->r)->h->data)->type == e_column && 
((sql_exp*)((list*)groupby->r)->h->data)->f) {
                /* e_column->f has been "misused" => an aggragation over array 
tiles */
                return _rel_tiling_aggr(sql, rel, groupby, distinct, aggrstr, 
sym, f);
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list