MonetDB: default - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: f588b95d6c17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f588b95d6c17
Modified Files:
        sql/backends/monet5/sql.mx
        sql/server/rel_optimizer.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (29 lines):

diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -4250,7 +4250,11 @@ mvc_import_table_wrap(Client cntxt, MalB
                throw(IO, "streams.open", "could not open file '%s': %s",
                                filename, strerror(errnr));
        }
-       s = bstream_create(ss, 33554432);
+#if SIZEOF_VOID_P == 4
+       s = bstream_create(ss, 0x20000);
+#else
+       s = bstream_create(ss, 0x2000000);
+#endif
        if (!s)
                throw(IO, "bstreams.create", "failed to create block stream");
        b = mvc_import_table(cntxt, be->mvc, s, *sname, *tname, (char*)tsep, 
(char*)rsep, (char*)ssep, (char*)ns, *sz, *offset, *locked);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -6290,7 +6290,8 @@ static sql_rel *
                rel = rewrite(sql, rel, &rel_push_project_down_union, &changes);
 
        /* Remove unused expressions */
-       rel = rel_dce(sql, rel);
+       if (level <= 0)
+               rel = rel_dce(sql, rel);
 
        if (gp.cnt[op_join] || 
            gp.cnt[op_left] || gp.cnt[op_right] || gp.cnt[op_full] || 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list