MonetDB: default - small fixes in assert()

[Jennie Zhang]

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

small fixes in assert()

- execute assert() before using the value
- column_r->type can not be type_int


diffs (18 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
@@ -1629,10 +1629,10 @@ static sql_exp *
 rel_column_ref(mvc *sql, sql_rel **rel, symbol *column_r, int f)
 {
        sql_exp *exp = NULL;
-       dlist *l = column_r->data.lval;
-
-       assert(column_r->token == SQL_COLUMN &&
-               (column_r->type == type_list || column_r->type == type_int));
+       dlist *l = NULL;
+
+       assert(column_r->token == SQL_COLUMN && column_r->type == type_list);
+       l = column_r->data.lval;
 
        if (dlist_length(l) == 1 && l->h->type == type_int) {
                int nr = l->h->data.i_val;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list