Changeset: 971cf72c879a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=971cf72c879a
Modified Files:
clients/Tests/exports.stable.out
sql/server/rel_dump.c
Branch: sq2default
Log Message:
approved output
diffs (87 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -717,9 +717,7 @@ str ALGfirstn(Client cntxt, MalBlkPtr mb
str ALGgroupby(bat *res, const bat *gids, const bat *cnts);
str ALGintersect(bat *r1, const bat *lid, const bat *rid, const bat *slid,
const bat *srid, const bit *nil_matches, const lng *estimate);
str ALGjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const
bat *sr, const bit *nil_matches, const lng *estimate);
-str ALGjoin1(bat *r1, const bat *l, const bat *r, const bat *sl, const bat
*sr, const bit *nil_matches, const lng *estimate);
str ALGleftjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl,
const bat *sr, const bit *nil_matches, const lng *estimate);
-str ALGleftjoin1(bat *r1, const bat *l, const bat *r, const bat *sl, const bat
*sr, const bit *nil_matches, const lng *estimate);
str ALGmaxany(ptr result, const bat *bid);
str ALGmaxany_skipnil(ptr result, const bat *bid, const bit *skipnil);
str ALGminany(ptr result, const bat *bid);
@@ -913,16 +911,14 @@ str CLTchangeUsername(Client cntxt, MalB
str CLTcheckPermission(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CLTgetClientId(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTgetPasswordHash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CLTgetProfile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTgetScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CLTgetTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTgetUsername(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTgetUsers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTmd5sum(str *ret, str *pw);
-str CLTqueryTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTquit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTremoveUser(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTripemd160sum(str *ret, str *pw);
-str CLTsessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsetListing(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsetPassword(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
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
@@ -235,6 +235,8 @@ exp_print(mvc *sql, stream *fout, sql_ex
mnstr_printf(fout, " !");
cmp_print(sql, fout, range2rcompare(e->flag) );
exp_print(sql, fout, e->f, depth+1, refs, 0, 0);
+ if (e->flag & CMP_BETWEEN)
+ mnstr_printf(fout, " BETWEEN ");
if (e->flag & CMP_SYMMETRIC)
mnstr_printf(fout, " SYM ");
} else {
@@ -249,7 +251,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
default:
;
}
- if (e->type != e_atom && is_ascending(e))
+ if (e->type != e_atom && e->type != e_cmp && is_ascending(e))
mnstr_printf(fout, " ASC");
if (e->type != e_atom && e->type != e_cmp && !has_nil(e))
mnstr_printf(fout, " NOT NULL");
@@ -1222,17 +1224,24 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
if (f == cmp_in || f == cmp_notin)
return exp_in(sql->sa, exp, exps, f);
} else {
- int sym = 0;
+ int sym = 0, between = 0;
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)
ne->flag |= CMP_SYMMETRIC;
+ if (between)
+ ne->flag |= CMP_BETWEEN;
if (is_anti(exp))
set_anti(ne);
return ne;
@@ -1240,6 +1249,8 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
sql_exp *ne = exp_compare(sql->sa, exp, e, f);
if (sym)
ne->flag |= CMP_SYMMETRIC;
+ if (between)
+ ne->flag |= CMP_BETWEEN;
if (is_anti(exp))
set_anti(ne);
return ne;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
