MonetDB: sq2 - small revert

[Niels Nes]

Changeset: 6673c1d1ca70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6673c1d1ca70
Modified Files:
        sql/server/rel_select.c
Branch: sq2
Log Message:

small revert


diffs (49 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
@@ -3897,7 +3897,7 @@ rel_binop(sql_query *query, sql_rel **re
        mvc *sql = query->sql;
        dnode *dl = se->data.lval->h;
        sql_exp *l, *r;
-       sql_rel *orel = *rel, *left, *right = NULL;
+       sql_rel *orel = *rel, *left;
        char *fname = qname_fname(dl->data.lval);
        char *sname = qname_schema(dl->data.lval);
        sql_schema *s = sql->session->schema;
@@ -3917,17 +3917,7 @@ rel_binop(sql_query *query, sql_rel **re
                l = rel_project_add_exp(sql, left, l);
                orel = left;
        }
-       r = rel_value_exp(query, &right, dl->next->next->data.sym, f, iek);
-       if (!r) {
-               /* reset error */
-               sql->session->status = 0;
-               sql->errstr[0] = '\0';
-               r = rel_value_exp(query, rel, dl->next->next->data.sym, f, iek);
-       } else if (left && right) {
-               *rel = rel_crossproduct(sql->sa, left, right, 
is_sql_sel(f)?op_left:op_join);
-       } else if (right) {
-               *rel = right;
-       }
+       r = rel_value_exp(query, rel, dl->next->next->data.sym, f, iek);
        if (l && *rel && exp_card(l) > CARD_AGGR && rel_find_groupby(*rel)) {
                if (l && exp_relname(l) && exp_name(l))
                        return sql_error(sql, ERR_GROUPBY, SQLSTATE(42000) 
"SELECT: cannot use non GROUP BY column '%s.%s' in query results without an 
aggregate function", exp_relname(l), exp_name(l));
@@ -5965,7 +5955,7 @@ rel_table_exp(sql_query *query, sql_rel 
                char *tname = column_e->data.lval->h->data.sval;
                list *exps;
        
-               if ((exps = rel_table_projections(sql, *rel, tname, 0)) != NULL)
+               if ((exps = rel_table_projections(sql, *rel, tname, 0)) != NULL 
&& !list_empty(exps))
                        return exps;
                if (!tname)
                        return sql_error(sql, 02,
@@ -6215,7 +6205,7 @@ rel_select_exp(sql_query *query, sql_rel
                        te = rel_table_exp(query, &rel, n->data.sym);
                } else 
                        ce = NULL;
-               if (!ce && (!te || list_empty(te))) {
+               if (!ce && !te) {
                        if (sql->errstr[0])
                                return NULL;
                        return sql_error(sql, 02, SQLSTATE(42000) "SELECT: 
subquery result missing");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list