MonetDB: sq2default - keep order of writing and reading the same

[Niels Nes]

Changeset: b694426ec878 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b694426ec878
Modified Files:
        sql/server/rel_dump.c
Branch: sq2default
Log Message:

keep order of writing and reading the same


diffs (28 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -1225,17 +1225,18 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
                                return exp_in(sql->sa, exp, exps, f);
                } else {
                        int sym = 0, between = 0;
+                       sql_exp *e = exp_read(sql, lrel, rrel, pexps, r, pos, 
0);
+
+                       if (strncmp(r+*pos, "BETWEEN",  strlen("BETWEEN")) == 
0) {
+                               (*pos)+= (int) strlen("BETWEEN");
+                               skipWS(r,pos);
+                               between = 1;
+                       }
                        if (strncmp(r+*pos, "SYM",  strlen("SYM")) == 0) {
                                (*pos)+= (int) strlen("SYM");
                                skipWS(r,pos);
                                sym = 1;
                        }
-                       if (strncmp(r+*pos, "BETWEEN",  strlen("BETWEEN")) == 
0) {
-                               (*pos)+= (int) strlen("BETWEEN");
-                               skipWS(r,pos);
-                               between = 1;
-                       }
-                       sql_exp *e = exp_read(sql, lrel, rrel, pexps, r, pos, 
0);
                        if (e && e->type == e_cmp) {
                                sql_exp *ne = exp_compare2(sql->sa, e->l, exp, 
e->r, compare2range(swap_compare((comp_type)f), e->flag));
                                if (sym)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list