Changeset: e930a3392ec5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e930a3392ec5
Modified Files:
sql/src/server/rel_dump.c
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (59 lines):
diff -r 2db119d675c8 -r e930a3392ec5 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Mon Nov 08 17:17:13 2010 +0100
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Mon Nov 08 21:30:36 2010 +0100
@@ -2147,6 +2147,7 @@
actions++;
continue;
}
+#if 0
if (match == 1 && getModuleId(p) == algebraRef &&
getFunctionId(p) == semijoinRef &&
((m=isMATalias(getArg(p,2), mat, mtop)) >= 0) &&
varGetProp(mb, getArg(p,1), hlbProp)) {
@@ -2157,6 +2158,7 @@
actions++;
continue;
}
+#endif
@-
Now we handle group, derive and aggregation statements.
@c
diff -r 2db119d675c8 -r e930a3392ec5 sql/src/server/rel_dump.c
--- a/sql/src/server/rel_dump.c Mon Nov 08 17:17:13 2010 +0100
+++ b/sql/src/server/rel_dump.c Mon Nov 08 21:30:36 2010 +0100
@@ -78,9 +78,15 @@
return;
switch(e->type) {
case e_convert: {
+ list *l = e->r;
+ sql_subtype *f = l->h->data;
+ char *to_type = sql_subtype_string(&e->tpe);
+ char *from_type = sql_subtype_string(f);
mnstr_printf(fout, "convert(");
exp_print(sql, fout, e->l, depth, 0, 0);
- mnstr_printf(fout, ")");
+ mnstr_printf(fout, " from %s to %s)", from_type, to_type);
+ _DELETE(to_type);
+ _DELETE(from_type);
break;
}
case e_atom: {
diff -r 2db119d675c8 -r e930a3392ec5 sql/src/server/rel_dump.mx
--- a/sql/src/server/rel_dump.mx Mon Nov 08 17:17:13 2010 +0100
+++ b/sql/src/server/rel_dump.mx Mon Nov 08 21:30:36 2010 +0100
@@ -94,9 +94,15 @@
return;
switch(e->type) {
case e_convert: {
+ list *l = e->r;
+ sql_subtype *f = l->h->data;
+ char *to_type = sql_subtype_string(&e->tpe);
+ char *from_type = sql_subtype_string(f);
mnstr_printf(fout, "convert(");
exp_print(sql, fout, e->l, depth, 0, 0);
- mnstr_printf(fout, ")");
+ mnstr_printf(fout, " from %s to %s)", from_type, to_type);
+ _DELETE(to_type);
+ _DELETE(from_type);
break;
}
case e_atom: {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
